mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3

Browse Source 
Conflicts:
	phpBB/includes/db/migrator.php
This commit is contained in:
Nathaniel Guse
2013-03-04 13:48:29 -06:00
parent 071defded6 eb5075c80f
commit c1840c78c5
78 changed files with 4979 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ class phpbb_db_migrator
}
}
$this->insert_migration($name, $state);
$this->set_migration_state($name, $state);
return true;
}
@@ -317,7 +317,7 @@ class phpbb_db_migrator
$state['migration_data_done'] = ($result === true) ? false : true;
}
$this->insert_migration($name, $state);
$this->set_migration_state($name, $state);
}
else
{
@@ -536,7 +536,7 @@ class phpbb_db_migrator
* @param array $state
* @return null
*/
protected function insert_migration($name, $state)
protected function set_migration_state($name, $state)
{
$migration_row = $state;
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
@@ -673,7 +673,7 @@ class phpbb_db_migrator
'migration_start_time' => time(),
'migration_end_time' => time(),
);
$this->insert_migration($name, $state);
$this->set_migration_state($name, $state);
}
}
}