diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
| commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
| tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /system/database/drivers/pdo | |
| parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
| parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
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 */ |