summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:31:42 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:31:42 +0100
commit8a51f885b1bfdb816088837cd4443511bd77ed7a (patch)
treebceed829e8b938c0a5e3ee4cb3869d370aba2cfc /system/database
parentf51e13f80b5539c329e43abc6004c5576862a27c (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-issue-499
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php18
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