- Timestamp:
- 2014-03-17T21:36:16+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp
r28899 r28911 68 68 << "<channel>\n" 69 69 << " <title>_collectionname_</title>\n" 70 << " <link>_httpdomain __httppageabout_</link>\n"70 << " <link>_httpdomainHtmlsafe__httppageabout_</link>\n" 71 71 << " <description>_collectionextra_</description>\n" 72 72 << " <language>_cgiarglHtmlsafe_</language>\n" … … 79 79 << " <title>_collectionname_</title>\n" 80 80 << " <url>_iconcollection_</url>\n" 81 << " <link>_httpdomain __httppageabout_</link>\n"81 << " <link>_httpdomainHtmlsafe__httppageabout_</link>\n" 82 82 << " <description>_collectionextra_</description>\n" 83 83 << "</image>\n"; … … 125 125 126 126 if(!args["hostname"].empty()) { 127 disp.setmacro("httpdomain", "Global", "http://" + encodeForURL(args["hostname"])); 127 disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]); 128 disp.setmacro("httpdomainHtmlsafe", "Global", "http://" + encodeForHTML(args["hostname"])); 128 129 } 129 130 else { // we shouldn't have to get here 130 disp.setmacro("httpdomain", "Global", "http://localhost:8282"); // the default used in zextra.dm. (Could perhaps default this to localhost too) 131 text_t default_domain = "http://localhost:8282"; 132 disp.setmacro("httpdomain", "Global", default_domain); // the default used in zextra.dm. (Could perhaps default this to localhost too) 133 disp.setmacro("httpdomain", "Global", encodeForHTML(default_domain)); 131 134 } 132 135 }
Note:
See TracChangeset
for help on using the changeset viewer.