diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-16 17:05:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-09-26 01:14:29 +0200 |
| commit | f8d6f0ef08f96c55c6934e60349aa5ff5ea00528 (patch) | |
| tree | 3038ff88c2aec318292ef2d3299970308c85441c /phpBB | |
| parent | 29c84be40a8c60fe98ba6bd2e817fcef14b491ba (diff) | |
| download | forums-f8d6f0ef08f96c55c6934e60349aa5ff5ea00528.tar forums-f8d6f0ef08f96c55c6934e60349aa5ff5ea00528.tar.gz forums-f8d6f0ef08f96c55c6934e60349aa5ff5ea00528.tar.bz2 forums-f8d6f0ef08f96c55c6934e60349aa5ff5ea00528.tar.xz forums-f8d6f0ef08f96c55c6934e60349aa5ff5ea00528.zip | |
[ticket/11691] Change detection of effectively_installed()
When start is set for a migration, it is not yet effectively installed.
So we just continue doing it...
PHPBB3-11691
Diffstat (limited to 'phpBB')
| -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()); |