mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4192 from marc1706/ticket/14496

Browse Source 
[ticket/14496] Cache last update of update list instead of using filemtime

* marc1706/ticket/14496:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
This commit is contained in:
Tristan Darricau 2016-03-09 21:53:14 +01:00
commit 61e0247f22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_update.php
View File

@ -283,6 +283,7 @@ class install_update extends module
// Make sure the update list is destroyed. // Make sure the update list is destroyed.
$cache->destroy('_update_list'); $cache->destroy('_update_list');
$cache->destroy('_update_list_time');
$cache->destroy('_diff_files'); $cache->destroy('_diff_files');
$cache->destroy('_expected_files'); $cache->destroy('_expected_files');
break; break;
@ -355,7 +356,7 @@ class install_update extends module
// We are directly within an update. To make sure our update list is correct we check its status. // We are directly within an update. To make sure our update list is correct we check its status.
$update_list = ($request->variable('check_again', false, false, \phpbb\request\request_interface::POST)) ? false : $cache->get('_update_list'); $update_list = ($request->variable('check_again', false, false, \phpbb\request\request_interface::POST)) ? false : $cache->get('_update_list');
$modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0; $modified = ($update_list !== false) ? $cache->get('_update_list_time') : 0;
// Make sure the list is up-to-date // Make sure the list is up-to-date
if ($update_list !== false) if ($update_list !== false)
@ -384,6 +385,7 @@ class install_update extends module
{ {
$this->get_update_structure($update_list, $expected_files); $this->get_update_structure($update_list, $expected_files);
$cache->put('_update_list', $update_list); $cache->put('_update_list', $update_list);
$cache->put('_update_list_time', time());
// Refresh the page if we are still not finished... // Refresh the page if we are still not finished...
if ($update_list['status'] != -1) if ($update_list['status'] != -1)