summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-04-09 22:41:11 +0200
committerAndrey Andreev <narf@devilix.net>2014-04-09 22:41:11 +0200
commite6942ae3963481b1cf2d98f340691a58a32e910a (patch)
tree2d17f20da61bd54001b83d64e725da9587b7d9bb
parent0c2309719369c4565c8e8987c75d21eff3279c5c (diff)
parent640ff4e348f6370b84b5d23c811f087e22d13819 (diff)
Merge pull request #2998 from etki/develop
Microfix
-rw-r--r--system/database/DB_driver.php6
1 files changed, 0 insertions, 6 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index fafce45c7..7a0914123 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -676,12 +676,6 @@ abstract class CI_DB_driver {
return TRUE;
}
- // Return TRUE if we don't need to create a result object
- if ($return_object !== TRUE)
- {
- return TRUE;
- }
-
// Load and instantiate the result driver
$driver = $this->load_rdriver();
$RES = new $driver($this);