diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-17 11:50:55 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-17 11:50:55 +0200 |
| commit | 4946c059379d39b5328e00dc265e0df8b1a1a8d2 (patch) | |
| tree | 5cf594ee19dc12b9b003ac6d4ab81aed6a4baba9 | |
| parent | 515d3b7cd1b20750a2fba84ec57da8df5e722e5c (diff) | |
| parent | 8303058ac613c1699b51a647b29b97f754fdf6a6 (diff) | |
| download | forums-4946c059379d39b5328e00dc265e0df8b1a1a8d2.tar forums-4946c059379d39b5328e00dc265e0df8b1a1a8d2.tar.gz forums-4946c059379d39b5328e00dc265e0df8b1a1a8d2.tar.bz2 forums-4946c059379d39b5328e00dc265e0df8b1a1a8d2.tar.xz forums-4946c059379d39b5328e00dc265e0df8b1a1a8d2.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 7eb5f94f60..60b8db8310 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -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) |