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

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/15135] Correctly pass exception arguments and add back link again
  [ticket/15135] Parse language files in acp_extensions instead of md manager
This commit is contained in:
Tristan Darricau 2017-03-24 23:08:02 +01:00
commit 1f1baf3e30
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,8 @@ class acp_extensions
} }
catch (\phpbb\extension\exception $e) catch (\phpbb\extension\exception $e)
{ {
trigger_error($e . adm_back_link($this->u_action), E_USER_WARNING); $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
} }
$extension = $phpbb_extension_manager->get_extension($ext_name); $extension = $phpbb_extension_manager->get_extension($ext_name);
@ -192,7 +193,8 @@ class acp_extensions
} }
catch (\phpbb\extension\exception $e) catch (\phpbb\extension\exception $e)
{ {
trigger_error($e . adm_back_link($this->u_action), E_USER_WARNING); $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
} }
$extension = $phpbb_extension_manager->get_extension($ext_name); $extension = $phpbb_extension_manager->get_extension($ext_name);

6
phpBB/phpbb/extension/metadata_manager.php
View file

@ -278,7 +278,7 @@ class metadata_manager
{ {
if (substr_count($this->ext_name, '/') !== 1 || $this->ext_name != $this->get_metadata('name')) if (substr_count($this->ext_name, '/') !== 1 || $this->ext_name != $this->get_metadata('name'))
{ {
throw new \phpbb\extension\exception($this->user->lang('EXTENSION_DIR_INVALID')); throw new \phpbb\extension\exception('EXTENSION_DIR_INVALID');
} }
return true; return true;
@ -295,7 +295,7 @@ class metadata_manager
{ {
if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb']))
{ {
throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'soft-require')); throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('soft-require'));
} }
return true; return true;
@ -311,7 +311,7 @@ class metadata_manager
{ {
if (!isset($this->metadata['require']['php'])) if (!isset($this->metadata['require']['php']))
{ {
throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'require php')); throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('require php'));
} }
return true; return true;