mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Code Issues Releases Wiki Activity

[ticket/12325] Fix: it's not stuck in an inifinite loop anymore

Browse Source 
PHPBB3-12325
This commit is contained in:
Tristan Darricau
2014-05-24 14:06:14 +02:00
parent 6e6891f841
commit 088f5b47c3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/install_update.php
View File

@ -366,7 +366,7 @@ class install_update extends module
$get_new_list = true; $get_new_list = true;
} }
if (!$get_new_list && ($update_list['status'] != -1 || $update_list['status_deleted'] != -1)) if (!$get_new_list && $update_list['status'] != -1)
{ {
$get_new_list = true; $get_new_list = true;
} }
@ -377,14 +377,14 @@ class install_update extends module
$cache->put('_update_list', $update_list); $cache->put('_update_list', $update_list);
// Refresh the page if we are still not finished... // Refresh the page if we are still not finished...
if ($update_list['status'] != -1 || $update_list['status_deleted'] != -1) if ($update_list['status'] != -1)
{ {
$refresh_url = append_sid($this->p_master->module_url, "language=$language&mode=$mode&sub=file_check"); $refresh_url = append_sid($this->p_master->module_url, "language=$language&mode=$mode&sub=file_check");
meta_refresh(2, $refresh_url); meta_refresh(2, $refresh_url);
$template->assign_vars(array( $template->assign_vars(array(
'S_IN_PROGRESS' => true, 'S_IN_PROGRESS' => true,
'S_COLLECTED' => (int) $update_list['status'] + (int) $update_list['status_deleted'], 'S_COLLECTED' => (int) $update_list['status'],
'S_TO_COLLECT' => sizeof($this->update_info['files']), 'S_TO_COLLECT' => sizeof($this->update_info['files']),
'L_IN_PROGRESS' => $user->lang['COLLECTING_FILE_DIFFS'], 'L_IN_PROGRESS' => $user->lang['COLLECTING_FILE_DIFFS'],
'L_IN_PROGRESS_EXPLAIN' => sprintf($user->lang['NUMBER_OF_FILES_COLLECTED'], (int) $update_list['status'], sizeof($this->update_info['files']) + sizeof($this->update_info['deleted'])), 'L_IN_PROGRESS_EXPLAIN' => sprintf($user->lang['NUMBER_OF_FILES_COLLECTED'], (int) $update_list['status'], sizeof($this->update_info['files']) + sizeof($this->update_info['deleted'])),
@ -1348,8 +1348,6 @@ class install_update extends module
$update_list['status']++; $update_list['status']++;
} }
$update_list['status'] = -1;
foreach ($this->update_info['deleted'] as $index => $file) foreach ($this->update_info['deleted'] as $index => $file)
{ {
if (is_int($update_list['status_deleted']) && $index < $update_list['status_deleted']) if (is_int($update_list['status_deleted']) && $index < $update_list['status_deleted'])
@ -1369,9 +1367,11 @@ class install_update extends module
} }
$update_list['status_deleted']++; $update_list['status_deleted']++;
$update_list['status']++;
} }
$update_list['status_deleted'] = -1; $update_list['status_deleted'] = -1;
$update_list['status'] = -1;
/* if (!sizeof($this->update_info['files'])) /* if (!sizeof($this->update_info['files']))
{ {