summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-12-26 19:42:04 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-12-26 19:42:04 +0100
commite596ea5da7d4a1a1166c51615e7d44af6f4605a0 (patch)
tree08b600927102e79e1aed89d5ab7feefc6a7d903e /system/database
parentffa86e89fbcaeb8726089e35c3c5ab5b01214b9c (diff)
parent511f225d855919b78df42ff802a513d84afa0693 (diff)
Merge pull request #709 from tubalmartin/2.1-stable
2.1.0 - Fatal error: Call to undefined method CI_DB_Driver::_reset_select()
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 3952d7276..4dfb584f2 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1387,7 +1387,21 @@ 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()
+ {
+
+ }
}