mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases 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

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

@ -444,22 +444,19 @@ class dbal_mysql extends dbal
'code' => @mysql_errno($this->db_connect_id),
);
}
else if (function_exists('mysql_error'))
{
$error = array(
'message' => @mysql_error(),
'code' => @mysql_errno(),
);
}
else
{
if (function_exists('mysql_error'))
{
$error = array(
'message' => @mysql_error(),
'code' => @mysql_errno(),
);
}
else
{
$error = array(
'message' => $this->connect_error,
'code' => '',
);
}
$error = array(
'message' => $this->connect_error,
'code' => '',
);
}
return $error;

25
phpBB/includes/db/mysqli.php
View File

@ -430,22 +430,19 @@ class dbal_mysqli extends dbal
'code' => @mysqli_errno($this->db_connect_id)
);
}
else if (function_exists('mysqli_connect_error'))
{
$error = array(
'message' => @mysqli_connect_error(),
'code' => @mysqli_connect_errno(),
);
}
else
{
if (function_exists('mysqli_connect_error'))
{
$error = array(
'message' => @mysqli_connect_error(),
'code' => @mysqli_connect_errno(),
);
}
else
{
$error = array(
'message' => $this->connect_error,
'code' => '',
);
}
$error = array(
'message' => $this->connect_error,
'code' => '',
);
}
return $error;