diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-20 10:09:17 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-20 10:09:17 +0100 |
| commit | 1dc43aaefb341daaae10841e5ca2504ba9b03d7c (patch) | |
| tree | 5302ec2800dd79865eba499c8f21dbba740d6953 /system/database/drivers | |
| parent | fb6bb5607e4c2580a6921e9317223d2447033a1d (diff) | |
Remove error suppression from mysql_*connect()
The suppression was kept so far because mysql_connect(),
mysql_pconnect() emit E_DEPRECATION messages on PHP 5.5+.
Well, we already default to 'mysqli' and there's no reason
to use specifically 'mysql' on PHP 5.5, so we might as well
let the deprecation notices appear and encourage users to
switch drivers.
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 41cb14ba4..064cae223 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -132,8 +132,8 @@ class CI_DB_mysql_driver extends CI_DB { // Error suppression is necessary mostly due to PHP 5.5+ issuing E_DEPRECATED messages $this->conn_id = ($persistent === TRUE) - ? @mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) - : @mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); + ? mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) + : mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); // ---------------------------------------------------------------- |