diff options
| author |   Tristan Darricau <github@nicofuma.fr> | 2017-01-15 11:58:04 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 11:58:04 +0100 |
| commit | 935da1ed2b86ffe733dfdda8e8f49f4b7d717afc (patch) | |
| tree | 994108733ccff135bc8bdf2ed7c2ae9cae0b0058 /phpBB/phpbb/extension | |
| parent | Merge pull request #4630 from hubaishan/ticket/14984 (diff) | |
| parent | Merge pull request #4646 from javiexin/ticket/15011 (diff) | |
| download | phpbb-935da1ed2b86ffe733dfdda8e8f49f4b7d717afc.tar.gz phpbb-935da1ed2b86ffe733dfdda8e8f49f4b7d717afc.tar.bz2 phpbb-935da1ed2b86ffe733dfdda8e8f49f4b7d717afc.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15011] Error not checked on metadata load failure
Diffstat (limited to 'phpBB/phpbb/extension')
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 2b8b1bbd6a..9ea3c7e541 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -214,7 +214,10 @@ class metadata_manager case 'all': $this->validate('display'); - $this->validate_enable(); + if (!$this->validate_enable()) + { + throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', $name)); + } break; case 'display': |