mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-26 10:54:21 +02:00
Code Issues Projects Releases Wiki Activity

MDL-32607 prevent upgrade_set_timeout abort in CLI scripts

Browse Source 
Credit goes to Michael Aherne, thanks.
This commit is contained in:
Petr Skoda 2012-04-26 19:23:43 +02:00
parent aa753ac24f
commit b814d1b4b2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/upgradelib.php
View File

@ -116,9 +116,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) {