diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-07-23 15:22:48 -0500 |
|---|---|---|
| committer | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 15:05:24 +0100 |
| commit | 4314284de12ceac5ae0792f3f4014b765d75d332 (patch) | |
| tree | 737848b4e131e95a36714a44b38c362188481dc3 /phpBB/includes/extension/metadata_manager.php | |
| parent | 8bbab088dd5830d8dd1151a3684dde5c197ba268 (diff) | |
| download | forums-4314284de12ceac5ae0792f3f4014b765d75d332.tar forums-4314284de12ceac5ae0792f3f4014b765d75d332.tar.gz forums-4314284de12ceac5ae0792f3f4014b765d75d332.tar.bz2 forums-4314284de12ceac5ae0792f3f4014b765d75d332.tar.xz forums-4314284de12ceac5ae0792f3f4014b765d75d332.zip | |
[ticket/10631] Remove code duplication
PHPBB3-10631
Diffstat (limited to 'phpBB/includes/extension/metadata_manager.php')
| -rw-r--r-- | phpBB/includes/extension/metadata_manager.php | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php index 0e0b609a68..c5e9baf1e7 100644 --- a/phpBB/includes/extension/metadata_manager.php +++ b/phpBB/includes/extension/metadata_manager.php @@ -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 (is_array($regex)) + { + foreach ($regex as $extra_name => $extra_regex) + { + $type = 'validate_' . $name . '_' . $extra_name; - if (!$this->$type()) + if (!$this->$type()) + { + return false; + } + } + } + else { - return false; + + $type = 'validate_' . $name; + + if (!$this->$type()) + { + return false; + } } } |