aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/extension/base.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-01-27 11:46:04 -0800
committerMatt Friedman <maf675@gmail.com>2016-01-27 11:46:04 -0800
commit3bd8a2ba196f240c5b982271af1ee8b2a2f8332b (patch)
tree8c3fa9178348ba1772103f2e78fa3c22b3b8ceef /phpBB/phpbb/extension/base.php
parent47d8aeebde6f763ec7247daf0df16dd2388b25b6 (diff)
downloadforums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.gz
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.bz2
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.xz
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.zip
[ticket/14434] Remove recursion to simplify is_migration method
PHPBB3-14434
Diffstat (limited to 'phpBB/phpbb/extension/base.php')
-rw-r--r--phpBB/phpbb/extension/base.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index b05c1af8d4..abdb10df88 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -137,9 +137,16 @@ class base implements \phpbb\extension\extension_interface
$migrations = $this->extension_finder->get_classes_from_files($migrations);
- // Unset classes that do not exist or do not extend the
- // abstract class phpbb\db\migration\migration
- \phpbb\db\migrator::is_migration($migrations);
+ // Unset classes that are not a valid migration
+ foreach ($migrations as $key => $migration)
+ {
+ if (\phpbb\db\migrator::is_migration($migration) === true)
+ {
+ continue;
+ }
+
+ unset($migrations[$key]);
+ }
return $migrations;
}