MDL-31553 do not timeout CLI upgrade scripts

Credit goes to Michael Aherne.
Jaswinder00 · Apr 22, 2012 · 5563f5f · 5563f5f
1 parent ead4f18
commit 5563f5f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
@@ -133,7 +133,12 @@ function upgrade_set_timeout($max_execution_time=300) {
         return;
     }
 
-    set_time_limit($max_execution_time);
+    if (CLI_SCRIPT) {
+        // there is no point in timing out of CLI scripts, admins can stop them if necessary
+        set_time_limit(0);
+    } else {
+        set_time_limit($max_execution_time);
+    }
     set_config('upgraderunning', $expected_end); // keep upgrade locked until this time
 }