Merge "Don't hardcode new location in print_export_footer()"

htdocs/admin/users/bulkdownload.php

@@ -227,4 +227,4 @@ $SESSION->set('exportfile', $zipfile);
 $wwwroot = get_config('wwwroot');
 $strexportgeneratedsuccessfullyjs = get_string('exportgeneratedsuccessfullyjs', 'export', '<a href="' . $wwwroot . '" target="_top">', '</a>');
 $strexportgeneratedsuccessfully   = get_string('exportgeneratedsuccessfully', 'export', '<a href="bulkdownload.php" target="_top">', '</a>');
-print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs);
+print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs, 'bulkdownload.php');

htdocs/export/download.php

@@ -114,4 +114,4 @@ $SESSION->set('exportfile', $exporter->get('exportdir') . $zipfile);
 $wwwroot = get_config('wwwroot');
 $strexportgeneratedsuccessfullyjs = get_string('exportgeneratedsuccessfullyjs', 'export', '<a href="' . $wwwroot . 'export/" target="_top">', '</a>');
 $strexportgeneratedsuccessfully   = get_string('exportgeneratedsuccessfully', 'export', '<a href="download.php" target="_top">', '</a>');
-print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs, $exporter->get('messages'));
+print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs, $exporter->get('messages'), 'download.php');

htdocs/lib/htmloutput.php

@@ -63,14 +63,14 @@ function print_iframe_progress_handler($percent, $status) {
     echo '<p class="progress-text">' . hsc($status) . "</p>\n";
 }
 
-function print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs, $jsmessages=array()) {
+function print_export_footer($strexportgeneratedsuccessfully, $strexportgeneratedsuccessfullyjs, $jsmessages=array(), $newlocation) {
 ?>
         <script type="text/javascript">
             document.write('<div class="progress-bar" style="width: 100%;"><p><?php echo $strexportgeneratedsuccessfullyjs; ?></p></div>');
             if (!window.opera) {
                 // Opera can't handle this for some reason - it vomits out the
                 // download inline in the iframe
-                document.location = 'download.php';
+                document.location = '<?php echo $newlocation; ?>';
             }
             var messages = <?php echo json_encode(join('; ', $jsmessages)); ?>;
             if (messages) {