MDL-15172 lowered timeoout and adding warning that users must not click continue...

diff --git a/backup/restorelib.php b/backup/restorelib.php
index d910af988461fc52b501fade56378e1d5edde830..219af471e2e2ae3a7d5124025588d1ce664832ec 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -7567,7 +7567,11 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             }
             else {
                 if (empty($noredirect)) {
-                    redirect($CFG->wwwroot.'/backup/restore.php?backup_unique_code='.$backup_unique_code.'&launch=form&file='.$file.'&id='.$id);
+                    // in 2.0 we must not print "Continue" redirect link here, because ppl click on it and the execution gets interrupted on next page!!!
+                    // imo RESTORE_SILENTLY is an ugly hack :-P
+                    $sillystr = get_string('donotclickcontinue');
+                    redirect($CFG->wwwroot.'/backup/restore.php?backup_unique_code='.$backup_unique_code.'&launch=form&file='.$file.'&id='.$id, $sillystr, 0);
+
                 } else {
                     return $backup_unique_code;
                 }

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index e59a867510a586cdb0a18847224bd707f66817f2..cf7d87315d9761787f20ed9582b9309d46a40e48 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -438,6 +438,7 @@ $string['displayingusers'] = 'Displaying users $a->start to $a->end';
 $string['displayonpage'] = 'Display on page';
 $string['documentation'] = 'Moodle Documentation';
 $string['donotask'] = 'Do Not Ask';
+$string['donotclickcontinue'] = 'Do not click on the following continue link ;-)';
 $string['down'] = 'Down';
 $string['downloadexcel'] = 'Download in Excel format';
 $string['downloadfile'] = 'Download file';