aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_extensions.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2016-09-01 16:12:04 +0200
committerTristan Darricau <github@nicofuma.fr>2016-12-03 16:37:36 +0100
commit57915a8aaa842064d42fee419c9e0eaf7288140a (patch)
treecf303c8a91d80e1fc593b17e23e291fa68ff75eb /phpBB/includes/acp/acp_extensions.php
parentab58bb8744b98478437cefd7af362aea1274621e (diff)
downloadforums-57915a8aaa842064d42fee419c9e0eaf7288140a.tar
forums-57915a8aaa842064d42fee419c9e0eaf7288140a.tar.gz
forums-57915a8aaa842064d42fee419c9e0eaf7288140a.tar.bz2
forums-57915a8aaa842064d42fee419c9e0eaf7288140a.tar.xz
forums-57915a8aaa842064d42fee419c9e0eaf7288140a.zip
[ticket/12610] Correctly handle empty cache
PHPBB3-12610
Diffstat (limited to 'phpBB/includes/acp/acp_extensions.php')
-rw-r--r--phpBB/includes/acp/acp_extensions.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 904dd2e960..ea6feb3e6a 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -12,6 +12,7 @@
*/
use phpbb\exception\exception_interface;
+use phpbb\exception\version_check_exception;
/**
* @ignore
@@ -518,6 +519,10 @@ class acp_extensions
$available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
}
}
+ catch (version_check_exception $e)
+ {
+ $available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
+ }
catch (exception_interface $e)
{
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
@@ -526,10 +531,6 @@ class acp_extensions
'S_VERSIONCHECK' => false,
));
}
- catch (\RuntimeException $e)
- {
- $available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
- }
}
uasort($available_extension_meta_data, array($this, 'sort_extension_meta_data_table'));