diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-10-02 20:46:11 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-10-02 20:46:11 +0530 |
| commit | 49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (patch) | |
| tree | 0547f055de0427ab04abf71001204715e5fff26f /phpBB/phpbb/db/migrator.php | |
| parent | f5676fab3cd362084c70afd251d2c0f3d54d08bf (diff) | |
| parent | 7aadcd547244455a9d3a8539cf6d243ec36a8be5 (diff) | |
| download | forums-49ce2c13b26e358b4ccef440094a8fa4b6b9afd7.tar forums-49ce2c13b26e358b4ccef440094a8fa4b6b9afd7.tar.gz forums-49ce2c13b26e358b4ccef440094a8fa4b6b9afd7.tar.bz2 forums-49ce2c13b26e358b4ccef440094a8fa4b6b9afd7.tar.xz forums-49ce2c13b26e358b4ccef440094a8fa4b6b9afd7.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11691:
[ticket/11691] Fix conversion test
[ticket/11691] Fix table names and arguments/docs
[ticket/11691] Move purge code into new function
[ticket/11691] Fix typo in comment
[ticket/11691] Add order by to the query
[ticket/11691] Fix some minor comments
[ticket/11691] Fix some more problems with softdelete update
[ticket/11691] Change detection of effectively_installed()
[ticket/11691] Stagger user notification reconversion even more
[ticket/11691] Stagger the convertion of soft delete updates
Diffstat (limited to 'phpBB/phpbb/db/migrator.php')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index d7d2b3df59..7efb23a230 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -208,7 +208,7 @@ class migrator if (!isset($this->migration_state[$name])) { - if ($migration->effectively_installed()) + if ($state['migration_start_time'] == 0 && $migration->effectively_installed()) { $state = array( 'migration_depends_on' => $migration->depends_on(), @@ -227,6 +227,8 @@ class migrator } } + $this->set_migration_state($name, $state); + if (!$state['migration_schema_done']) { $this->apply_schema_changes($migration->update_schema()); |