summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:42:44 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:42:44 +0100
commitd6abf118dcf018bf9d3535410daadf1135ad6c05 (patch)
tree9dde3cd7ba72e0fadda265445034a18198f24501 /system/database
parentd6ded84f70c2a84fb0d161dabdb9656dfdd05698 (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-driver
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 744bb3cd7..0fe3dfc7e 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1346,6 +1346,22 @@ 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 */