diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:56:40 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:56:40 -0500 |
| commit | aae7a81270013f0f700033dd091fd9db216eb889 (patch) | |
| tree | b9c3566c7d3e5f6c56677cd1ae68be28bb4b1314 /phpBB/includes/db/driver/mysqli.php | |
| parent | 10ee54d0280087a81236c05fbaf2c30f3b976b08 (diff) | |
| parent | 0916dc14efaa36073cdc9783401b818ecc0716cc (diff) | |
| download | forums-aae7a81270013f0f700033dd091fd9db216eb889.tar forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.gz forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.bz2 forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.xz forums-aae7a81270013f0f700033dd091fd9db216eb889.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (101 commits)
[ticket/10491] Make recreate_database static.
[ticket/11088] Pass required objects in as arguments
[ticket/11088] Globalize objects in new permission function
[ticket/11088] Move permission creation to a function
[ticket/11088] Copy a_styles permission for a_extensions
[ticket/11088] Remove extraneous word from sentence in comment
[ticket/11088] Changed "file extensions" to "attachment extensions"
[ticket/11088] Fix the database updater to correctly manipulate the modules
[ticket/11088] Put language pack module move below extension module creation
[ticket/11088] Untested, progress on update script
[ticket/11088] Fix typo (period instead of comma)
[ticket/11088] Untested progress for update script
[ticket/11088] Added missing comma
[ticket/11088] Removed added space
[ticket/11088] Move style, extension and language pack management to customise
[ticket/11243] Show download all link on all pages of topic with attachments
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Pass arguments in correct order.
[ticket/10491] Install board once per test run.
[ticket/11257] Do not require set_name() method to exist
...
Diffstat (limited to 'phpBB/includes/db/driver/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/driver/mysqli.php | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php index 0cc3eb359a..be28a95715 100644 --- a/phpBB/includes/db/driver/mysqli.php +++ b/phpBB/includes/db/driver/mysqli.php @@ -24,12 +24,19 @@ if (!defined('IN_PHPBB')) class phpbb_db_driver_mysqli extends phpbb_db_driver { 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; @@ -421,18 +428,29 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver */ 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; } /** |