makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 11:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10205] Reduce nesting in mysql drivers.

Browse source 
PHPBB3-10205
This commit is contained in:
Oleg Pudeyev 2012-12-04 21:33:13 -05:00
parent 597dea1e04
commit 5120f36a25
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/db/mysql.php
View file

@ -444,9 +444,7 @@ class dbal_mysql extends dbal
'code' => @mysql_errno($this->db_connect_id), 'code' => @mysql_errno($this->db_connect_id),
); );
} }
else else if (function_exists('mysql_error'))
{
if (function_exists('mysql_error'))
{ {
$error = array( $error = array(
'message' => @mysql_error(), 'message' => @mysql_error(),
@ -460,7 +458,6 @@ class dbal_mysql extends dbal
'code' => '', 'code' => '',
); );
} }
}
return $error; return $error;
} }

5
phpBB/includes/db/mysqli.php
View file

@ -430,9 +430,7 @@ class dbal_mysqli extends dbal
'code' => @mysqli_errno($this->db_connect_id) 'code' => @mysqli_errno($this->db_connect_id)
); );
} }
else else if (function_exists('mysqli_connect_error'))
{
if (function_exists('mysqli_connect_error'))
{ {
$error = array( $error = array(
'message' => @mysqli_connect_error(), 'message' => @mysqli_connect_error(),
@ -446,7 +444,6 @@ class dbal_mysqli extends dbal
'code' => '', 'code' => '',
); );
} }
}
return $error; return $error;
} }