mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11372' into develop

Browse Source 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11372:
  [ticket/11372] Migrator should only check if effectively installed if not
This commit is contained in:
David King 2013-02-28 11:17:23 -05:00
commit b1735e30bd
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpBB/includes/db/migrator.php
View File

@ -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();
}