summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-02-06 14:54:23 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-02-06 14:54:23 +0100
commit7825526a596b0db6a15fac519cf45e2e929c684d (patch)
treefd3c2fc812206af6c77a18698431910b785dc9d7
parent1a0929aec8a6bd8af3eadefe5f48927b9ea4358d (diff)
cache_stop() fix...
-rw-r--r--system/database/DB_active_rec.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index b3bf02a8b..263172a86 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1449,10 +1449,7 @@ class CI_DB_active_record extends CI_DB_driver {
*/
function _compile_select($select_override = FALSE)
{
- if ($this->ar_caching === TRUE)
- {
- $this->_merge_cache();
- }
+ $this->_merge_cache();
$sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT ';