From e70e92bab1de57a0749a31f2889b55cafb46d58e Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Mon, 25 Apr 2011 10:50:53 -0500
Subject: Fixing up a tabs vs spaces inconsistency in DB_Result

---
 system/database/DB_result.php | 83 +++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 39 deletions(-)

(limited to 'system/database')

diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 06eec5124..e83228386 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -32,7 +32,7 @@ class CI_DB_result {
 	var $result_id		  = NULL;
 	var $result_array	  = array();
 	var $result_object	  = array();
- var $custom_result_object = array();
+	var $custom_result_object = array();
 	var $current_row	  = 0;
 	var $num_rows		  = 0;
 	var $row_data		  = NULL;
@@ -47,47 +47,52 @@ class CI_DB_result {
 	 */
 	function result($type = 'object')
 	{
-  if ($type == 'array') return $this->result_array();
-  else if ($type == 'object') return $this->result_object();
-  else return $this->custom_result_object($type);
+		if ($type == 'array') return $this->result_array();
+		else if ($type == 'object') return $this->result_object();
+		else return $this->custom_result_object($type);
 	}
 
 	// --------------------------------------------------------------------
 
- /**
-  * Custom query result.
-  *
-  * @param class_name A string that represents the type of object you want back
-  * @return array of objects
-  */
- function custom_result_object($class_name)
- {
-  if (array_key_exists($class_name, $this->custom_result_object))
-  {
-   return $this->custom_result_object[$class_name];
-  }
-
-  if ($this->result_id === FALSE OR $this->num_rows() == 0)
-  {
-   return array();
-  }
-
-  // add the data to the object
-  $this->_data_seek(0);
-  $result_object = array();
+	/**
+	 * Custom query result.
+	 *
+	 * @param class_name A string that represents the type of object you want back
+	 * @return array of objects
+	 */
+	function custom_result_object($class_name)
+	{
+		if (array_key_exists($class_name, $this->custom_result_object))
+		{
+			return $this->custom_result_object[$class_name];
+		}
+
+		if ($this->result_id === FALSE OR $this->num_rows() == 0)
+		{
+			return array();
+		}
+
+		// add the data to the object
+		$this->_data_seek(0);
+		$result_object = array();
+
 		while ($row = $this->_fetch_object())
-  {
-   $object = new $class_name();
-   foreach ($row as $key => $value)
-   {
-    $object->$key = $value;
-   }
+		{
+			$object = new $class_name();
+			
+			foreach ($row as $key => $value)
+			{
+				$object->$key = $value;
+			}
+			
 			$result_object[] = $object;
 		}
 
-  // return the array
-  return $this->custom_result_object[$class_name] = $result_object;
- }
+		// return the array
+		return $this->custom_result_object[$class_name] = $result_object;
+	}
+
+	// --------------------------------------------------------------------
 
 	/**
 	 * Query result. "object" version.
@@ -180,9 +185,9 @@ class CI_DB_result {
 			$n = 0;
 		}
 
-  if ($type == 'object') return $this->row_object($n);
-  else if ($type == 'array') return $this->row_array($n);
-  else return $this->custom_row_object($n, $type);
+		if ($type == 'object') return $this->row_object($n);
+		else if ($type == 'array') return $this->row_array($n);
+		else return $this->custom_row_object($n, $type);
 	}
 
 	// --------------------------------------------------------------------
@@ -219,7 +224,7 @@ class CI_DB_result {
 
 	// --------------------------------------------------------------------
 
- /**
+	/**
 	 * Returns a single result row - custom object version
 	 *
 	 * @access	public
@@ -242,7 +247,7 @@ class CI_DB_result {
 		return $result[$this->current_row];
 	}
 
- /**
+	/**
 	 * Returns a single result row - object version
 	 *
 	 * @access	public
-- 
cgit v1.2.3-24-g4f1b


From 827f3de2733e85ede6311feb2e4bf73ecf209eb3 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Fri, 6 May 2011 11:29:57 -0500
Subject: Fixed a regression where a PHP error could occur when using some
 methods.

---
 system/database/DB_active_rec.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/database')

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 508f6bedf..83d481699 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -204,6 +204,7 @@ class CI_DB_active_record extends CI_DB_driver {
 		$sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias;
 
 		$this->ar_select[] = $sql;
+		$this->ar_no_escape[] = NULL;
 
 		if ($this->ar_caching === TRUE)
 		{
-- 
cgit v1.2.3-24-g4f1b