[ticket/11372] Migrator should only check if effectively installed if not

installed at all

PHPBB3-11372
This commit is contained in:
Nathaniel Guse 2013-02-27 13:52:45 -06:00
parent 80bd78a5e5
commit 9b554fbf3c

View file

@ -316,20 +316,20 @@ class phpbb_db_migrator
'class' => $migration, 'class' => $migration,
); );
if ($migration->effectively_installed()) if (!isset($this->migration_state[$name]))
{ {
$state = array( if ($migration->effectively_installed())
'migration_depends_on' => $migration->depends_on(), {
'migration_schema_done' => true, $state = array(
'migration_data_done' => true, 'migration_depends_on' => $migration->depends_on(),
'migration_data_state' => '', 'migration_schema_done' => true,
'migration_start_time' => 0, 'migration_data_done' => true,
'migration_end_time' => 0, 'migration_data_state' => '',
); 'migration_start_time' => 0,
} 'migration_end_time' => 0,
else );
{ }
if (!isset($this->migration_state[$name])) else
{ {
$state['migration_start_time'] = time(); $state['migration_start_time'] = time();
$this->insert_migration($name, $state); $this->insert_migration($name, $state);