summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-10-28 13:39:48 +0100
committerAndrey Andreev <narf@devilix.net>2013-10-28 13:39:48 +0100
commitac4d30862241c61637b2138fa97da131e5b07c1f (patch)
tree6218484271c1ddea58831db721301e0264001437 /system
parent6a424902ba0dbd59de2dd6e69bbf9e73d10c083d (diff)
parent710c4ed57e916714b04bec079b03cb47621ec393 (diff)
Merge branch 'develop' into feature/minify
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 95c3af3a9..ebc9855bc 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2555,7 +2555,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
{
foreach ($this->$qb_cache_var as &$cache_var)
{
- in_array($cache_var, $this->$qb_variable, TRUE) OR $this->$qb_variable[] = $cache_var;
+ in_array($cache_var, $this->$qb_variable, TRUE) OR $this->{$qb_variable}[] = $cache_var;
}
}
}