diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 18:16:36 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 18:16:36 +0100 |
| commit | 43ba6783c5cb32dbba91c1949de9d3447bcadd38 (patch) | |
| tree | ae9e14ccda2ef3e04b37b5f2596707675595e837 | |
| parent | c4ee378456a8018dacd831598adcc782c62f69e9 (diff) | |
| parent | 0f640ab7af20865e25897f47973e350e481fe1c8 (diff) | |
| download | forums-43ba6783c5cb32dbba91c1949de9d3447bcadd38.tar forums-43ba6783c5cb32dbba91c1949de9d3447bcadd38.tar.gz forums-43ba6783c5cb32dbba91c1949de9d3447bcadd38.tar.bz2 forums-43ba6783c5cb32dbba91c1949de9d3447bcadd38.tar.xz forums-43ba6783c5cb32dbba91c1949de9d3447bcadd38.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15011] Output meaningful errors when validating all metadata
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 348b3c2cdf..ae1af10c1d 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -214,9 +214,19 @@ class metadata_manager case 'all': $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; |