1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00

Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/15011] Error not checked on metadata load failure
This commit is contained in:
Tristan Darricau 2017-01-15 11:58:04 +01:00
commit 935da1ed2b
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881

View File

@ -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':