diff options
| author | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
|---|---|---|
| committer | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
| commit | d348135ed2131e5fa41dfa0ea7254d2f6759f3e0 (patch) | |
| tree | 14cfc61c47686b895acd9e49b45c559d311195cc /system/database/drivers/pdo | |
| parent | bb2c83bddbf51c42815be3de60eab24fd87ae392 (diff) | |
| parent | d207c9218531afe666168c1f5f59abd1bc19a8aa (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Conflicts:
system/core/Security.php
Diffstat (limited to 'system/database/drivers/pdo')
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 60151b900..89e69676d 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -29,7 +29,7 @@ * PDO Database Adapter Class * * Note: _DB is an extender class that the app controller - * creates dynamically based on whether the active record + * creates dynamically based on whether the query builder * class is being used or not. * * @package CodeIgniter @@ -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."'" : ''); @@ -683,4 +683,4 @@ class CI_DB_pdo_driver extends CI_DB { } /* End of file pdo_driver.php */ -/* Location: ./system/database/drivers/pdo/pdo_driver.php */
\ No newline at end of file +/* Location: ./system/database/drivers/pdo/pdo_driver.php */ |