mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

[ticket/10631] Remove code duplication

Browse Source 
PHPBB3-10631
This commit is contained in:
Nathan Guse 2012-07-23 15:22:48 -05:00 committed by Unknown Bliss
parent 8bbab088dd
commit 4314284de1
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
phpBB/includes/extension/metadata_manager.php
View File

@ -232,22 +232,29 @@ class phpbb_extension_metadata_manager
*/
public function validate_metadata_array()
{
$validate = array(
'name',
'type',
'licence',
'description',
'version',
'extra_display-name',
);
foreach ($validate as $type)
foreach ($this->validation as $name => $regex)
{
$type = 'validate_' . $type;
if (!$this->$type())
if (is_array($regex))
{
return false;
foreach ($regex as $extra_name => $extra_regex)
{
$type = 'validate_' . $name . '_' . $extra_name;
if (!$this->$type())
{
return false;
}
}
}
else
{
$type = 'validate_' . $name;
if (!$this->$type())
{
return false;
}
}
}