diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 04:06:30 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 04:41:46 -0500 |
| commit | 1a7e2211c35218094e30ddc399d4aa6b45fe75f4 (patch) | |
| tree | 819d8a3dd0fe3dd987c4578abb4a1a0d37179d49 /phpBB/includes/db/mysqli.php | |
| parent | 025a95ea909d449e14cb22564983fb005e3f8c06 (diff) | |
| download | forums-1a7e2211c35218094e30ddc399d4aa6b45fe75f4.tar forums-1a7e2211c35218094e30ddc399d4aa6b45fe75f4.tar.gz forums-1a7e2211c35218094e30ddc399d4aa6b45fe75f4.tar.bz2 forums-1a7e2211c35218094e30ddc399d4aa6b45fe75f4.tar.xz forums-1a7e2211c35218094e30ddc399d4aa6b45fe75f4.zip | |
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
PHPBB3-10205
Diffstat (limited to 'phpBB/includes/db/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index 98b659723f..cd82a12b58 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -425,10 +425,20 @@ class dbal_mysqli extends dbal { if (!$this->db_connect_id) { - return array( - 'message' => @mysqli_connect_error(), - 'code' => @mysqli_connect_errno() - ); + if (function_exists('mysqli_connect_error')) + { + return array( + 'message' => @mysqli_connect_error(), + 'code' => @mysqli_connect_errno(), + ); + } + else + { + return array( + 'message' => $this->connect_error, + 'code' => '', + ); + } } return array( |