makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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) switch ($name)
{ {
case 'all': case 'all':
$this->validate('display'); $this->validate_enable();
// no break
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;
case 'display': case 'display':
foreach ($fields as $field => $data) foreach ($fields as $field => $data)