diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 21:08:57 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 21:08:57 +0100 |
| commit | 6f9d923baa43e2ef60bafdd263730aa4f5f103e7 (patch) | |
| tree | 068fbd93ac1027544437b0241902565821d5dab2 /system/database/DB_driver.php | |
| parent | 0a529c2be1f9f888f481afa989bd7d3db615c85f (diff) | |
| parent | 8480f7c35af9aacaf2ebee43677ff1d31a5cce13 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlite3
Diffstat (limited to 'system/database/DB_driver.php')
| -rw-r--r-- | system/database/DB_driver.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 12cd3917c..42b1b35aa 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -38,7 +38,7 @@ * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/database/ */ -class CI_DB_driver { +abstract class CI_DB_driver { public $dsn; public $username; @@ -670,7 +670,7 @@ class CI_DB_driver { */ public function escape($str) { - if (is_string($str)) + if (is_string($str) OR method_exists($str, '__toString')) { $str = "'".$this->escape_str($str)."'"; } @@ -1357,11 +1357,9 @@ class CI_DB_driver { * * @return void */ - protected function _reset_select() - { - } + abstract protected function _reset_select(); } /* End of file DB_driver.php */ -/* Location: ./system/database/DB_driver.php */ +/* Location: ./system/database/DB_driver.php */
\ No newline at end of file |