mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 18:15:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
* 3.1.x:
  [ticket/15011] Output meaningful errors when validating all metadata
This commit is contained in:
Tristan Darricau 2017-01-15 18:16:36 +01:00
commit 43ba6783c5
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/extension/metadata_manager.php
View File

@ -214,9 +214,19 @@ class metadata_manager
case 'all': case 'all':
$this->validate('display'); $this->validate('display');
if (!$this->validate_enable()) if (!$this->validate_dir())
{ {
throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array($name)); throw new \phpbb\extension\exception('EXTENSION_DIR_INVALID');
}
if (!$this->validate_require_phpbb())
{
throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('soft-require'));
}
if (!$this->validate_require_php())
{
throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('require php'));
} }
break; break;