1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.2.x'

* 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
2 changed files with 7 additions and 5 deletions

View File

@@ -278,7 +278,7 @@ class metadata_manager
{
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;
@@ -295,7 +295,7 @@ class metadata_manager
{
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;
@@ -311,7 +311,7 @@ class metadata_manager
{
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;