makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# By Nathan Guse (1) and Nathaniel Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11367:
  [ticket/11367] Always freeresult
  [ticket/11367] Migrator throws error if migrations table does not exist
This commit is contained in:
David King 2013-02-26 15:46:08 -05:00
commit 80bd78a5e5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,18 +99,26 @@ class phpbb_db_migrator
{ {
$this->migration_state = array(); $this->migration_state = array();
// prevent errors in case the table does not exist yet
$this->db->sql_return_on_error(true);
$sql = "SELECT * $sql = "SELECT *
FROM " . $this->migrations_table; FROM " . $this->migrations_table;
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
if (!$this->db->sql_error_triggered)
{
while ($migration = $this->db->sql_fetchrow($result)) while ($migration = $this->db->sql_fetchrow($result))
{ {
$this->migration_state[$migration['migration_name']] = $migration; $this->migration_state[$migration['migration_name']] = $migration;
$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']); $this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
} }
}
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->db->sql_return_on_error(false);
} }
/** /**