diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:37:40 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:37:40 +0200 |
commit | fd9e46e852d073ae6fb8680f26e9825805104e1c (patch) | |
tree | ab665546f404a61b2a97fa686ce1f7d2a37ffc79 /system/database/drivers/pdo/pdo_driver.php | |
parent | 16be2c2489535c79b38688413df26f95adbe0ea3 (diff) | |
parent | 38b2a256758ee8184d354cbdb0eac467118af36b (diff) |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/pdo/pdo_driver.php')
-rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 19338e30f..a9bed367e 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -247,19 +247,6 @@ class CI_DB_pdo_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Select the database - * - * @return resource - */ - public function db_select() - { - // Not needed for PDO - return TRUE; - } - - // -------------------------------------------------------------------- - - /** * Database version number * * @return string @@ -484,7 +471,7 @@ class CI_DB_pdo_driver extends CI_DB { * @param string * @return string */ - function count_all($table = '') + public function count_all($table = '') { if ($table == '') { |