aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-12 12:45:02 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-28 22:19:02 +0200
commitf4d598559f28ef2f16b47d7e33d90305fd42173e (patch)
tree0019eb08a93c59ab7dccb0209840bd70a7d0f0a9 /phpBB
parent13ecddf85bce88cb0b99684040578ffa766db782 (diff)
downloadforums-f4d598559f28ef2f16b47d7e33d90305fd42173e.tar
forums-f4d598559f28ef2f16b47d7e33d90305fd42173e.tar.gz
forums-f4d598559f28ef2f16b47d7e33d90305fd42173e.tar.bz2
forums-f4d598559f28ef2f16b47d7e33d90305fd42173e.tar.xz
forums-f4d598559f28ef2f16b47d7e33d90305fd42173e.zip
[ticket/11366] Use force_cache on the list page
PHPBB3-11366
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_extensions.php16
1 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 6b22ba7fe0..f1372ddb3e 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -308,7 +308,8 @@ class acp_extensions
'META_VERSION' => $meta['version'],
);
- $updates = $this->version_check($md_manager, $this->request->variable('versioncheck_force', false));
+ $force_update = $this->request->variable('versioncheck_force', false);
+ $updates = $this->version_check($md_manager, $force_update, !$force_update);
$enabled_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
@@ -363,7 +364,8 @@ class acp_extensions
'META_VERSION' => $meta['version'],
);
- $updates = $this->version_check($md_manager, $this->request->variable('versioncheck_force', false));
+ $force_update = $this->request->variable('versioncheck_force', false);
+ $updates = $this->version_check($md_manager, $force_update, !$force_update);
$disabled_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
@@ -421,7 +423,8 @@ class acp_extensions
'META_VERSION' => $meta['version'],
);
- $updates = $this->version_check($md_manager, $this->request->variable('versioncheck_force', false));
+ $force_update = $this->request->variable('versioncheck_force', false);
+ $updates = $this->version_check($md_manager, $force_update, !$force_update);
$available_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates);
$available_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
@@ -476,11 +479,12 @@ class acp_extensions
* Check the version and return the available updates.
*
* @param \phpbb\extension\metadata_manager $md_manager The metadata manager for the version to check.
- * @param bool $force Ignores cached data. Default to false.
+ * @param bool $force_update Ignores cached data. Defaults to false.
+ * @param bool $force_cache Force the use of the cache. Override $force_update.
* @return string
* @throws RuntimeException
*/
- protected function version_check(\phpbb\extension\metadata_manager $md_manager, $force = false)
+ protected function version_check(\phpbb\extension\metadata_manager $md_manager, $force_update = false, $force_cache = false)
{
$meta = $md_manager->get_metadata('all');
@@ -496,7 +500,7 @@ class acp_extensions
$version_helper->set_file_location($version_check ['host'], $version_check ['directory'], $version_check ['filename']);
$version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);
- return $updates = $version_helper->get_suggested_updates($force, true);
+ return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);
}
/**