diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 22:05:09 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 22:05:09 +0200 |
| commit | c7bd2a87f0a23a574f2687b3c2989f7683fd2786 (patch) | |
| tree | 0d2abd06b028e0cc381ccc6345ac65e418bf3728 /system | |
| parent | 0713b94f5245c9180b58207b661155f084fb493b (diff) | |
| parent | 5dba032b6d53cf91ab733c61bd5795c81f021af6 (diff) | |
Merge pull request #1294 from toopay/pdo-patch
Hotfix PDO
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 60151b900..d7d4db358 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -225,7 +225,7 @@ class CI_DB_pdo_driver extends CI_DB { * * Reference: http://www.php.net/manual/en/ref.pdo-mysql.connection.php */ - if ($this->subdriver === 'mysql' && ! is_php('5.3.6') && ! empty($this->char_set)) + if ($this->pdodriver === 'mysql' && ! is_php('5.3.6') && ! empty($this->char_set)) { $this->options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES '.$this->char_set .( ! empty($this->db_collat) ? " COLLATE '".$this->dbcollat."'" : ''); |