summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:40:02 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:40:02 +0100
commit59910a6a12b27b2b8a2085f206eb2b7e263253ff (patch)
tree7609da267b941b6e9afa3a823c3a4adbe4533224 /system/database/DB_driver.php
parent776a6a23ff43d4f9118ab044bfdfed07a0e50c12 (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'system/database/DB_driver.php')
-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