1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 23:07:39 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2016-12-08 22:00:45 +01:00

View File

@@ -451,6 +451,10 @@ class acp_extensions
$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false; $disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
} }
} }
catch (version_check_exception $e)
{
$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
}
catch (exception_interface $e) catch (exception_interface $e)
{ {
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
@@ -461,7 +465,7 @@ class acp_extensions
} }
catch (\RuntimeException $e) catch (\RuntimeException $e)
{ {
$disabeld_extension_meta_data[$name]['S_VERSIONCHECK'] = false; $disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
} }
} }