diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
| commit | 273cc47ae496f74a482ab47b305537a3fa1925f7 (patch) | |
| tree | 86843e04095b6e210ee6837fcf23f5d551ee3932 /system/database/drivers | |
| parent | f83c4363b5459d294255e3817a230258861ec79b (diff) | |
| parent | 3fb026713013b60845c4cfe633a8a59a30b9c7dd (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_qb_aliasing
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 0a454da6c..91ab13a3c 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -69,7 +69,7 @@ class CI_DB_mysqli_driver extends CI_DB { ? 'p:'.$this->hostname : $this->hostname; $port = empty($this->port) ? NULL : $this->port; $client_flags = ($this->compress === TRUE) ? MYSQLI_CLIENT_COMPRESS : 0; - $mysqli = new mysqli(); + $mysqli = mysqli_init(); return @$mysqli->real_connect($hostname, $this->username, $this->password, $this->database, $port, NULL, $client_flags) ? $mysqli : FALSE; |