diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 03:08:21 +0100 |
| commit | b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (patch) | |
| tree | ea97afaa481306dbb0a111490b9443f80de56a29 /phpBB/includes/db/mysqli.php | |
| parent | ebc15a8b6cb62e29371cb02d6421ea46e47a4020 (diff) | |
| parent | b5f94a14f1a5c77366f824780f1120a1b5e9184a (diff) | |
| download | forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.gz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.bz2 forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.tar.xz forums-b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10205] Reduce nesting in mysql drivers.
[ticket/10205] Rewrite _sql_error implementations to have a single return.
[ticket/10205] Cosmetic changes.
[ticket/10205] Add some columns to the empty fixture file for mssqlnative.
[ticket/10205] Delete stray return.
[ticket/10205] Test failed connection attempts.
[ticket/10205] Check for function existence in mssql connect method.
[ticket/10205] Convert mssqlnative driver to the same logic.
[ticket/10205] Fix a parse error in oracle driver.
[ticket/10205] Fix remaining db drivers.
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
[ticket/10205] Account for potentially missing extensions in dbal.
Conflicts:
tests/fixtures/empty.xml
Diffstat (limited to 'phpBB/includes/db/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index 6d81b8bc3e..5713b1992c 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -26,12 +26,19 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); class dbal_mysqli extends dbal { var $multi_insert = true; + var $connect_error = ''; /** * Connect to server */ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false) { + if (!function_exists('mysqli_connect')) + { + $this->connect_error = 'mysqli_connect function does not exist, is mysqli extension installed?'; + return $this->sql_error(''); + } + // Mysqli extension supports persistent connection since PHP 5.3.0 $this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false; $this->user = $sqluser; @@ -423,18 +430,29 @@ class dbal_mysqli extends dbal */ function _sql_error() { - if (!$this->db_connect_id) + if ($this->db_connect_id) + { + $error = array( + 'message' => @mysqli_error($this->db_connect_id), + 'code' => @mysqli_errno($this->db_connect_id) + ); + } + else if (function_exists('mysqli_connect_error')) { - return array( + $error = array( 'message' => @mysqli_connect_error(), - 'code' => @mysqli_connect_errno() + 'code' => @mysqli_connect_errno(), + ); + } + else + { + $error = array( + 'message' => $this->connect_error, + 'code' => '', ); } - return array( - 'message' => @mysqli_error($this->db_connect_id), - 'code' => @mysqli_errno($this->db_connect_id) - ); + return $error; } /** |