summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGDmac <grdalenoort@gmail.com>2013-11-11 13:18:09 +0100
committerGDmac <grdalenoort@gmail.com>2013-11-11 13:18:09 +0100
commit17a0528c23c4d6cf95b03299fbfe2ff789b82249 (patch)
treefc3b8af618e7b96b498911e3e324158c8abcf7d5 /system
parent5d9b03b022bbc95c3c57830cc4cc27c39c7a59be (diff)
Cleanup PR #2719
for Fix #2406 query builder cache Signed-off-by: GDmac <grdalenoort@gmail.com>
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_query_builder.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 0d0421306..fb8514f5c 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2557,22 +2557,19 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
return;
}
- $parts = array_unique($this->qb_cache_exists); // select, from, etc.
-
- foreach ($parts as $val)
+ foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
{
$qb_variable = 'qb_'.$val;
$qb_cache_var = 'qb_cache_'.$val;
$qb_new = $this->$qb_cache_var;
- foreach ($this->$qb_variable as $qb_var)
+ foreach ($this->$qb_variable as &$qb_var)
{
in_array($qb_var, $qb_new, TRUE) OR $qb_new[] = $qb_var;
}
$this->$qb_variable = $qb_new;
-
}
// If we are "protecting identifiers" we need to examine the "from"