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/extension | |
| 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/extension')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index a7531350f7..c7778cfed1 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -73,9 +73,7 @@ class base implements \phpbb\extension\extension_interface */ public function enable_step($old_state) { - $migrations = $this->get_migration_file_list(); - - $this->migrator->set_migrations($migrations); + $this->get_migration_file_list(); $this->migrator->update(); @@ -103,8 +101,6 @@ class base implements \phpbb\extension\extension_interface { $migrations = $this->get_migration_file_list(); - $this->migrator->set_migrations($migrations); - foreach ($migrations as $migration) { while ($this->migrator->migration_state($migration) !== false) @@ -137,16 +133,9 @@ class base implements \phpbb\extension\extension_interface $migrations = $this->extension_finder->get_classes_from_files($migrations); - // Unset classes that are not a valid migration - foreach ($migrations as $key => $migration) - { - if (\phpbb\db\migrator::is_migration($migration) === true) - { - continue; - } + $this->migrator->set_migrations($migrations); - unset($migrations[$key]); - } + $migrations = $this->migrator->get_migrations(); return $migrations; } |