Merge branch 'w18_MDL-32607_m22_upgrade2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

2012-05-01 13:33:53 +12:00
parent 0ee1c3db00 9257815ff1
commit d0eeb25a64
1 changed files with 7 additions and 3 deletions
@@ -8564,9 +8564,13 @@ function upgrade_set_timeout($max_execution_time=300) {
    }

    if (!$upgraderunning) {
-        // upgrade not running or aborted
-        print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
-        die;
+        if (CLI_SCRIPT) {
+            // never stop CLI upgrades
+            $upgraderunning = 0;
+        } else {
+            // web upgrade not running or aborted
+            print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
+        }
    }

    if ($max_execution_time < 60) {