diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 06:26:38 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-09 16:42:45 -0600 |
| commit | ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e (patch) | |
| tree | 3138d8f7dbd0d8d7aa418d28db7a6df5b6b43cf0 /phpBB/includes/db | |
| parent | 2a7985c26fcf558c30fa316262344307ffc99e9e (diff) | |
| download | forums-ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e.tar forums-ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e.tar.gz forums-ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e.tar.bz2 forums-ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e.tar.xz forums-ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e.zip | |
[feature/migrations] Use $this->db
PHPBB3-9737
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/migration.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php index aca9d264bb..de9f6d07e3 100644 --- a/phpBB/includes/db/migration.php +++ b/phpBB/includes/db/migration.php @@ -95,29 +95,29 @@ class phpbb_db_migration echo "<br />\n{$sql}\n<br />"; } - $db->sql_return_on_error(true); + $this->db->sql_return_on_error(true); if ($sql === 'begin') { - $result = $db->sql_transaction('begin'); + $result = $this->db->sql_transaction('begin'); } else if ($sql === 'commit') { - $result = $db->sql_transaction('commit'); + $result = $this->db->sql_transaction('commit'); } else { - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) + $result = $this->db->sql_query($sql); + if ($this->db->sql_error_triggered) { $this->errors[] = array( - 'sql' => $db->sql_error_sql, - 'code' => $db->sql_error_returned, + 'sql' => $this->db->sql_error_sql, + 'code' => $this->db->sql_error_returned, ); } } - $db->sql_return_on_error(false); + $this->db->sql_return_on_error(false); return $result; } |