diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-15 22:55:11 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-15 22:55:11 +0200 |
| commit | 63391f7db5811c5569246a713df456d602cbad13 (patch) | |
| tree | 190bdf9317c42bb2453faa88ef7b6455db1f2032 /system/database/drivers/mysqli | |
| parent | e3621cc79fa4b4658768fea0694cc0ae52835d85 (diff) | |
| parent | c7719284833f211984474623832b96707173e02d (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/database/drivers/mysqli')
| -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 f77176c16..dc72ecc5f 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; |