diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-27 13:52:45 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-27 13:52:45 -0600 |
| commit | 9b554fbf3c9d1cb720fbd340bba552328790967f (patch) | |
| tree | f712c9ab62af894e32dbf018ae8666b56870950f /phpBB/includes/db | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-9b554fbf3c9d1cb720fbd340bba552328790967f.tar forums-9b554fbf3c9d1cb720fbd340bba552328790967f.tar.gz forums-9b554fbf3c9d1cb720fbd340bba552328790967f.tar.bz2 forums-9b554fbf3c9d1cb720fbd340bba552328790967f.tar.xz forums-9b554fbf3c9d1cb720fbd340bba552328790967f.zip | |
[ticket/11372] Migrator should only check if effectively installed if not
installed at all
PHPBB3-11372
Diffstat (limited to 'phpBB/includes/db')
| -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 74f71775f3..1ba65d71a6 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(); $this->insert_migration($name, $state); |