From 5563f5fbbbb53a6a034cd16cd3fb97eeb0ed640f Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 22 Apr 2012 17:51:06 +0200 Subject: [PATCH] MDL-31553 do not timeout CLI upgrade scripts Credit goes to Michael Aherne. --- lib/upgradelib.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/upgradelib.php b/lib/upgradelib.php index 608fd8302e5..947e5c5a208 100644 --- 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 }