Commit 3dae9587 authored by Dries's avatar Dries
Browse files

- Patch #43002 by drumm: critical bugfix: avoid infinite loops in update script.

parent 83cb8d9e
......@@ -387,12 +387,15 @@ function update_progress_page() {
* the overall percent finished. The second element is a status message.
*/
function update_do_updates() {
while (($update = reset($_SESSION['update_remaining'])) && timer_read('page') < 1000) {
while (($update = reset($_SESSION['update_remaining']))) {
$update_finished = update_data($update['module'], $update['version']);
if ($update_finished) {
// Dequeue the completed update.
unset($_SESSION['update_remaining'][key($_SESSION['update_remaining'])]);
}
if (timer_read('page') > 1000) {
break;
}
}
if ($_SESSION['update_total']) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment