mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/10205] Rewrite _sql_error implementations to have a single return.

Browse Source 
PHPBB3-10205
This commit is contained in:
Oleg Pudeyev
2012-12-04 21:32:02 -05:00
parent 89c9c9d4b0
commit 597dea1e04
5 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/db/mysql.php
View File

@@ -437,28 +437,32 @@ class dbal_mysql extends dbal
*/
function _sql_error()
{
if (!$this->db_connect_id)
if ($this->db_connect_id)
{
$error = array(
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id),
);
}
else
{
if (function_exists('mysql_error'))
{
return array(
$error = array(
'message' => @mysql_error(),
'code' => @mysql_errno(),
);
}
else
{
return array(
$error = array(
'message' => $this->connect_error,
'code' => '',
);
}
}
return array(
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id),
);
return $error;
}
/**