diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:44:51 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:44:51 +0100 |
commit | 6f7af78e253ddcff3770c5497f804367b098d09b (patch) | |
tree | 66d090479dfbd7800d866d2cb005593d03b8305b /system/database | |
parent | 4f7ea7072281ea8e400a08bda2b67a8b5c5bdf20 (diff) | |
parent | 002b4be248e448227a718e6f7d9ee39ccc575745 (diff) |
Merge remote-tracking branch 'upstream/develop' into develop-issue-863
Diffstat (limited to 'system/database')
-rw-r--r-- | system/database/DB_driver.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 271a70ec4..6352c731e 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1424,7 +1424,23 @@ class CI_DB_driver { return $item.$alias; } + + // -------------------------------------------------------------------- + + /** + * Dummy method that allows Active Record class to be disabled + * + * This function is used extensively by every db driver. + * + * @access private + * @return void + */ + 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 |