makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2025-03-03 21:55:31 +01:00
commit 79ff5b18ce
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/acp/acp_extensions.php
View file

@ -12,6 +12,7 @@
*/ */
use phpbb\exception\exception_interface; use phpbb\exception\exception_interface;
use phpbb\exception\runtime_exception;
use phpbb\exception\version_check_exception; use phpbb\exception\version_check_exception;
/** /**
@ -388,7 +389,7 @@ class acp_extensions
$this->template->assign_block_vars('updates_available', $updates_available); $this->template->assign_block_vars('updates_available', $updates_available);
} }
catch (exception_interface $e) catch (runtime_exception $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()));
@ -797,7 +798,7 @@ class acp_extensions
$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true; $enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true;
$enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&action=details&versioncheck_force=1&ext_name=' . urlencode($md_manager->get_metadata('name')); $enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&action=details&versioncheck_force=1&ext_name=' . urlencode($md_manager->get_metadata('name'));
} }
catch (exception_interface $e) catch (runtime_exception $e)
{ {
// Ignore exceptions due to the version check // Ignore exceptions due to the version check
} }
@ -807,7 +808,7 @@ class acp_extensions
$enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false; $enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
} }
} }
catch (exception_interface $e) catch (runtime_exception $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()));
$this->template->assign_block_vars('disabled', array( $this->template->assign_block_vars('disabled', array(
@ -887,7 +888,7 @@ class acp_extensions
{ {
$disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false; $disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
} }
catch (exception_interface $e) catch (runtime_exception $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()));
$this->template->assign_block_vars('disabled', array( $this->template->assign_block_vars('disabled', array(
@ -969,7 +970,7 @@ class acp_extensions
{ {
$available_extension_meta_data[$name]['S_VERSIONCHECK'] = false; $available_extension_meta_data[$name]['S_VERSIONCHECK'] = false;
} }
catch (exception_interface $e) catch (runtime_exception $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()));
$this->template->assign_block_vars('not_installed', array( $this->template->assign_block_vars('not_installed', array(

2
phpBB/includes/acp/acp_main.php
View file

@ -476,7 +476,7 @@ class acp_main
'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false, 'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
)); ));
} }
catch (\RuntimeException $e) catch (\phpbb\exception\runtime_exception $e)
{ {
$message = call_user_func_array(array($user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $message = call_user_func_array(array($user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
$template->assign_vars(array( $template->assign_vars(array(