Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-04-17 11:51:16 +02:00
commit 4206e25b2a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

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)