diff options
| author | Matt Friedman <maf675@gmail.com> | 2016-01-28 11:22:30 -0800 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2016-01-28 12:17:35 -0800 |
| commit | 27027deb9ce2076f64dbfdecba494efe1aa523dc (patch) | |
| tree | a5c317cde6d38a42318da19a91e0fc83abbcd601 /phpBB/phpbb/console/command/db | |
| parent | fb1acb0ef463bc38421248497e7f0b7b271600f7 (diff) | |
| download | forums-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/console/command/db')
| -rw-r--r-- | phpBB/phpbb/console/command/db/list_command.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/db/migration_command.php | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/phpbb/console/command/db/list_command.php b/phpBB/phpbb/console/command/db/list_command.php index dfec5c7da2..708107b592 100644 --- a/phpBB/phpbb/console/command/db/list_command.php +++ b/phpBB/phpbb/console/command/db/list_command.php @@ -39,12 +39,6 @@ class list_command extends \phpbb\console\command\db\migration_command foreach ($this->load_migrations() as $name) { - // Ignore non-migration files - if (\phpbb\db\migrator::is_migration($name) === false) - { - continue; - } - if ($this->migrator->migration_state($name) !== false) { $installed[] = $name; diff --git a/phpBB/phpbb/console/command/db/migration_command.php b/phpBB/phpbb/console/command/db/migration_command.php index d44ef8c5cb..b951560588 100644 --- a/phpBB/phpbb/console/command/db/migration_command.php +++ b/phpBB/phpbb/console/command/db/migration_command.php @@ -45,7 +45,7 @@ abstract class migration_command extends \phpbb\console\command\command $this->migrator->set_migrations($migrations); - return $migrations; + return $this->migrator->get_migrations(); } protected function finalise_update() |