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

[feature/migrations] Use $this->db

Browse Source 
PHPBB3-9737
This commit is contained in:
Nathaniel Guse
2012-11-10 06:26:38 -06:00
committed by Nathan Guse
parent 2a7985c26f
commit ae8edf7b0e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/db/migration.php
View File

@ -95,29 +95,29 @@ class phpbb_db_migration
echo "<br />\n{$sql}\n<br />"; echo "<br />\n{$sql}\n<br />";
} }
$db->sql_return_on_error(true); $this->db->sql_return_on_error(true);
if ($sql === 'begin') if ($sql === 'begin')
{ {
$result = $db->sql_transaction('begin'); $result = $this->db->sql_transaction('begin');
} }
else if ($sql === 'commit') else if ($sql === 'commit')
{ {
$result = $db->sql_transaction('commit'); $result = $this->db->sql_transaction('commit');
} }
else else
{ {
$result = $db->sql_query($sql); $result = $this->db->sql_query($sql);
if ($db->sql_error_triggered) if ($this->db->sql_error_triggered)
{ {
$this->errors[] = array( $this->errors[] = array(
'sql' => $db->sql_error_sql, 'sql' => $this->db->sql_error_sql,
'code' => $db->sql_error_returned, 'code' => $this->db->sql_error_returned,
); );
} }
} }
$db->sql_return_on_error(false); $this->db->sql_return_on_error(false);
return $result; return $result;
} }