From ae123e0b3d749a13d8820d0a6b773ca25b0ed380 Mon Sep 17 00:00:00 2001
From: Jamie Rumbelow <jamie@jamierumbelow.net>
Date: Tue, 21 Feb 2012 16:39:56 +0000
Subject: Fixing an error in #1061

---
 system/database/DB_query_builder.php | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'system/database/DB_query_builder.php')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index b6ad0f3d8..fad879389 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2103,8 +2103,8 @@ class CI_DB_query_builder extends CI_DB_driver {
 
 		foreach ($this->qb_cache_exists as $val)
 		{
-			$qb_variable	= 'ar_'.$val;
-			$qb_cache_var	= 'ar_cache_'.$val;
+			$qb_variable	= 'qb_'.$val;
+			$qb_cache_var	= 'qb_cache_'.$val;
 
 			if (count($this->$qb_cache_var) === 0)
 			{
@@ -2168,21 +2168,21 @@ class CI_DB_query_builder extends CI_DB_driver {
 	protected function _reset_select()
 	{
 		$this->_reset_run(array(
-					'ar_select'		=> array(),
-					'ar_from'		=> array(),
-					'ar_join'		=> array(),
-					'ar_where'		=> array(),
-					'ar_like'		=> array(),
-					'ar_groupby'		=> array(),
-					'ar_having'		=> array(),
-					'ar_orderby'		=> array(),
-					'ar_wherein'		=> array(),
-					'ar_aliased_tables'	=> array(),
-					'ar_no_escape'		=> array(),
-					'ar_distinct'		=> FALSE,
-					'ar_limit'		=> FALSE,
-					'ar_offset'		=> FALSE,
-					'ar_order'		=> FALSE
+					'qb_select'		=> array(),
+					'qb_from'		=> array(),
+					'qb_join'		=> array(),
+					'qb_where'		=> array(),
+					'qb_like'		=> array(),
+					'qb_groupby'		=> array(),
+					'qb_having'		=> array(),
+					'qb_orderby'		=> array(),
+					'qb_wherein'		=> array(),
+					'qb_aliased_tables'	=> array(),
+					'qb_no_escape'		=> array(),
+					'qb_distinct'		=> FALSE,
+					'qb_limit'		=> FALSE,
+					'qb_offset'		=> FALSE,
+					'qb_order'		=> FALSE
 					)
 				);
 	}
@@ -2199,14 +2199,14 @@ class CI_DB_query_builder extends CI_DB_driver {
 	protected function _reset_write()
 	{
 		$this->_reset_run(array(
-					'ar_set'	=> array(),
-					'ar_from'	=> array(),
-					'ar_where'	=> array(),
-					'ar_like'	=> array(),
-					'ar_orderby'	=> array(),
-					'ar_keys'	=> array(),
-					'ar_limit'	=> FALSE,
-					'ar_order'	=> FALSE
+					'qb_set'	=> array(),
+					'qb_from'	=> array(),
+					'qb_where'	=> array(),
+					'qb_like'	=> array(),
+					'qb_orderby'	=> array(),
+					'qb_keys'	=> array(),
+					'qb_limit'	=> FALSE,
+					'qb_order'	=> FALSE
 					)
 				);
 	}
-- 
cgit v1.2.3-24-g4f1b