diff options
| author | David King <imkingdavid@gmail.com> | 2013-02-28 11:17:23 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-02-28 11:17:23 -0500 |
| commit | b1735e30bd8e377bbdd5d305cd838339b0af2bf9 (patch) | |
| tree | 3ece0854eaf8da4842a74d159a050cb8b6f8369d /phpBB | |
| parent | 0808e08c0b9c1f6baf80365341385e06a1d35d0f (diff) | |
| parent | 9b554fbf3c9d1cb720fbd340bba552328790967f (diff) | |
| download | forums-b1735e30bd8e377bbdd5d305cd838339b0af2bf9.tar forums-b1735e30bd8e377bbdd5d305cd838339b0af2bf9.tar.gz forums-b1735e30bd8e377bbdd5d305cd838339b0af2bf9.tar.bz2 forums-b1735e30bd8e377bbdd5d305cd838339b0af2bf9.tar.xz forums-b1735e30bd8e377bbdd5d305cd838339b0af2bf9.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11372' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11372:
[ticket/11372] Migrator should only check if effectively installed if not
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/migrator.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php index 89b253bc8c..ec0b6a87da 100644 --- a/phpBB/includes/db/migrator.php +++ b/phpBB/includes/db/migrator.php @@ -316,20 +316,20 @@ class phpbb_db_migrator 'class' => $migration, ); - if ($migration->effectively_installed()) + if (!isset($this->migration_state[$name])) { - $state = array( - 'migration_depends_on' => $migration->depends_on(), - 'migration_schema_done' => true, - 'migration_data_done' => true, - 'migration_data_state' => '', - 'migration_start_time' => 0, - 'migration_end_time' => 0, - ); - } - else - { - if (!isset($this->migration_state[$name])) + if ($migration->effectively_installed()) + { + $state = array( + 'migration_depends_on' => $migration->depends_on(), + 'migration_schema_done' => true, + 'migration_data_done' => true, + 'migration_data_state' => '', + 'migration_start_time' => 0, + 'migration_end_time' => 0, + ); + } + else { $state['migration_start_time'] = time(); } |