mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-02 23:12:46 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2017-04-17 11:50:55 +02:00
commit 4946c05937
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,23 +142,8 @@ class metadata_manager
switch ($name)
{
case 'all':
$this->validate('display');
if (!$this->validate_dir())
{
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;
$this->validate_enable();
// no break
case 'display':
foreach ($fields as $field => $data)