mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 09:01:29 +02: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
parent 0808e08c0b 9b554fbf3c
commit b1735e30bd
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,6 +316,8 @@ class phpbb_db_migrator
'class' => $migration, 'class' => $migration,
); );
if (!isset($this->migration_state[$name]))
{
if ($migration->effectively_installed()) if ($migration->effectively_installed())
{ {
$state = array( $state = array(
@@ -328,8 +330,6 @@ class phpbb_db_migrator
); );
} }
else else
{
if (!isset($this->migration_state[$name]))
{ {
$state['migration_start_time'] = time(); $state['migration_start_time'] = time();
} }