summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-02-29 12:59:35 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-02-29 12:59:35 +0100
commit6b414d12c3ddeb09f62b0a1e111599390fa3f613 (patch)
treef1a1b4b2f200c93316064f4692b93f7f5ed45962 /system/database
parent0aa8c60ae7eee0122c42ae17d42fd5471a575743 (diff)
parentdb6066511bfc1a728049fdadaad14f1d10cd9796 (diff)
Merged in 2.1-stable changes.
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