Index: branches/5.2.x/core/admin_templates/export/export_progress.tpl
===================================================================
diff -u -N -r16062 -r16339
--- branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/export/export_progress.tpl	(.../export_progress.tpl)	(revision 16339)
@@ -8,7 +8,7 @@
 	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 	<script type="text/javascript">
 		function cancel_action() {
-			redirect('<inp2:m_Link template="export/export_complete"/>');
+			redirect('<inp2:m_Link template="export/export_complete" no_amp="1" js_escape="1"/>');
 		}
 
 		function rand(n)
@@ -22,7 +22,7 @@
 		for(var i=0; i<10; i++) {
 			export_rand += (rand(10) - 1);
 		}
-		var action_url = '<inp2:m_t template="index" adm_event="OnExportCSV" type="return_progress" finish_template="export/export_complete" PrefixSpecial="#PrefixSpecial#" grid="#grid#" export_rand="#export_rand#" pass="m,adm" no_amp="1"/>';
+		var action_url = '<inp2:m_t template="index" adm_event="OnExportCSV" type="return_progress" finish_template="export/export_complete" PrefixSpecial="#PrefixSpecial#" grid="#grid#" export_rand="#export_rand#" pass="m,adm" no_amp="1" js_escape="1"/>';
 		action_url = action_url.replace('#PrefixSpecial#', PrefixSpecial);
 		action_url = action_url.replace('#grid#', grid);
 		action_url = action_url.replace('#export_rand#', export_rand);