aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/module
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-01-28 11:22:30 -0800
committerMatt Friedman <maf675@gmail.com>2016-01-28 12:17:35 -0800
commit27027deb9ce2076f64dbfdecba494efe1aa523dc (patch)
treea5c317cde6d38a42318da19a91e0fc83abbcd601 /phpBB/phpbb/install/module
parentfb1acb0ef463bc38421248497e7f0b7b271600f7 (diff)
downloadforums-27027deb9ce2076f64dbfdecba494efe1aa523dc.tar
forums-27027deb9ce2076f64dbfdecba494efe1aa523dc.tar.gz
forums-27027deb9ce2076f64dbfdecba494efe1aa523dc.tar.bz2
forums-27027deb9ce2076f64dbfdecba494efe1aa523dc.tar.xz
forums-27027deb9ce2076f64dbfdecba494efe1aa523dc.zip
[ticket/14434] Refactored to check migrations when setting them
PHPBB3-14434
Diffstat (limited to 'phpBB/phpbb/install/module')
-rw-r--r--phpBB/phpbb/install/module/update_database/task/update.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php
index eb9bdc8138..4b2baf2c23 100644
--- a/phpBB/phpbb/install/module/update_database/task/update.php
+++ b/phpBB/phpbb/install/module/update_database/task/update.php
@@ -139,17 +139,8 @@ class update extends task_base
->extension_directory('/migrations')
->get_classes();
- // Unset classes that are not a valid migration
- foreach ($migrations as $key => $migration_class)
- {
- if (\phpbb\db\migrator::is_migration($migration_class) === false)
- {
- unset($migrations[$key]);
- }
- }
-
$this->migrator->set_migrations($migrations);
- $migration_count = count($migrations);
+ $migration_count = count($this->migrator->get_migrations());
$this->iohandler->set_task_count($migration_count, true);
$progress_count = $this->installer_config->get('database_update_count', 0);