From b9189ec325c20b6b058a2f4928152a253f04ae6c Mon Sep 17 00:00:00 2001 From: javiexin Date: Sat, 14 Jan 2017 18:08:23 +0100 Subject: [PATCH 1/2] [ticket/15011] Error not checked on metadata load failure PHPBB3-15011 --- phpBB/phpbb/extension/metadata_manager.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index a64d88fe39..2919661114 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -229,7 +229,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': From d6e42ec63b54c54b488d3e4112f4cd83062731ba Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 15 Jan 2017 12:00:36 +0100 Subject: [PATCH 2/2] [ticket/15011] Fix 3.2.x merge PHPBB3-15011 --- phpBB/phpbb/extension/metadata_manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 9ea3c7e541..348b3c2cdf 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -216,7 +216,7 @@ class metadata_manager if (!$this->validate_enable()) { - throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', $name)); + throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array($name)); } break;