diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-10-17 19:54:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-10-17 19:54:19 +0200 |
| commit | 7bdff132ffcaa9cd9342efc21e6eb30151219320 (patch) | |
| tree | a272f036233affa37f74e299a807dd1063c9ebc6 /phpBB/phpbb | |
| parent | ee9eb586dd49edd8044a9910782a01aef691e0df (diff) | |
| parent | 490626d985b50a5f4bbb7d31931c68c5a28898ac (diff) | |
| download | forums-7bdff132ffcaa9cd9342efc21e6eb30151219320.tar forums-7bdff132ffcaa9cd9342efc21e6eb30151219320.tar.gz forums-7bdff132ffcaa9cd9342efc21e6eb30151219320.tar.bz2 forums-7bdff132ffcaa9cd9342efc21e6eb30151219320.tar.xz forums-7bdff132ffcaa9cd9342efc21e6eb30151219320.zip | |
Merge pull request #4997 from kasimi/ticket/15396
[ticket/15396] Fix revert_schema() steps not executed in correct order
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index d7d7f18d2b..6c026c3ae1 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -503,11 +503,14 @@ class migrator return; } - foreach ($this->migration_state as $name => $state) + foreach ($this->migrations as $name) { - if (!empty($state['migration_depends_on']) && in_array($migration, $state['migration_depends_on'])) + $state = $this->migration_state($name); + + if ($state && in_array($migration, $state['migration_depends_on']) && ($state['migration_schema_done'] || $state['migration_data_done'])) { $this->revert_do($name); + return; } } |