makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/15011] Fix 3.2.x merge
  [ticket/15011] Error not checked on metadata load failure
This commit is contained in:
Tristan Darricau 2017-01-15 12:01:26 +01:00
commit 567034e306
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/phpbb/extension/metadata_manager.php
View file

@ -214,7 +214,10 @@ class metadata_manager
case 'all': case 'all':
$this->validate('display'); $this->validate('display');
$this->validate_enable(); if (!$this->validate_enable())
{
throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array($name));
}
break; break;
case 'display': case 'display':