mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
1de4b6d260
1 changed files with 5 additions and 1 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue