Changeset 28930 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2014-03-19T19:11:13+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/collectoraction.cpp
r22984 r28930 962 962 963 963 // set _pagescriptextra_ macro to _cpagescriptextra_ 964 disp.setmacro ("pagescriptextra", "collector", "_" + collector_page+ "scriptextra_");964 disp.setmacro ("pagescriptextra", "collector", "_" + encodeForHTML(collector_page) + "scriptextra_"); 965 965 966 966 if (collector_page == "bildstatus" || collector_page == "bilddone" || 967 967 collector_page == "bildfail" || collector_page == "bildframe1") { 968 disp.setmacro ("header", "collector", "_" + collector_page+ "header_");968 disp.setmacro ("header", "collector", "_" + encodeForHTML(collector_page) + "header_"); 969 969 } 970 970 … … 1332 1332 // output page ("bild" page was already output above) 1333 1333 textout << outconvert << disp << ("_collector:header_\n") 1334 << ("_collector:" + collector_page+ "content_\n")1334 << ("_collector:" + encodeForHTML(collector_page) + "content_\n") 1335 1335 << ("_collector:footer_\n"); 1336 1336 } -
main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp
r28899 r28930 424 424 } 425 425 426 cached_metadata_values += "\"" + args_name + "\":\"" + args_val+ "\"";426 cached_metadata_values += "\"" + args_name + "\":\"" + encodeForJavascript(args_val) + "\""; 427 427 } 428 428 }
Note:
See TracChangeset
for help on using the changeset viewer.