diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:02:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:02:53 +0100 |
| commit | 2b3edbddf2398f225836d5763d112f331fe607ed (patch) | |
| tree | bd9a5df6b3b8d607d0a6e0b385c2e23900b76e4f /system/database/DB_driver.php | |
| parent | c25c3d3d61ff38a348224252c1b3c9041e50ac32 (diff) | |
| parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) | |
Merge upstream branch and fix private methods to be protected
Diffstat (limited to 'system/database/DB_driver.php')
| -rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 661b42ced..7445a5069 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -257,7 +257,7 @@ class CI_DB_driver { // Some DBs have functions that return the version, and don't run special // SQL queries per se. In these instances, just return the result. - $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo'); + $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli'); if (in_array($this->dbdriver, $driver_version_exceptions)) { |