hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit

1 files changed, 16 insertions, 16 deletions

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index d94d4a13c..52bad260a 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -58,7 +58,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	var $ar_cache_having		= array();
 	var $ar_cache_orderby		= array();
 	var $ar_cache_set			= array();
-
+	
 	var $ar_no_escape 			= array();
 	var $ar_cache_no_escape     = array();
 
@@ -176,7 +176,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	 *	select_max()
 	 *	select_min()
 	 *	select_avg()
-	 * select_sum()
+	 *  select_sum()
 	 *
 	 * @access	public
 	 * @param	string	the field
@@ -287,7 +287,7 @@ class CI_DB_active_record extends CI_DB_driver {
 			{
 				$val = trim($val);
 
-				// Extract any aliases that might exist. We use this information
+				// Extract any aliases that might exist.  We use this information
 				// in the _protect_identifiers to know whether to add a table prefix
 				$this->_track_aliases($val);
 
@@ -333,7 +333,7 @@ class CI_DB_active_record extends CI_DB_driver {
 			}
 		}
 
-		// Extract any aliases that might exist. We use this information
+		// Extract any aliases that might exist.  We use this information
 		// in the _protect_identifiers to know whether to add a table prefix
 		$this->_track_aliases($table);
 
@@ -439,7 +439,7 @@ class CI_DB_active_record extends CI_DB_driver {
 
 					$v = ' '.$this->escape($v);
 				}
-
+				
 				if ( ! $this->_has_operator($k))
 				{
 					$k .= ' = ';
@@ -927,7 +927,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	// --------------------------------------------------------------------
 
 	/**
-	 * The "set" function. Allows key/value pairs to be set for inserting or updating
+	 * The "set" function.  Allows key/value pairs to be set for inserting or updating
 	 *
 	 * @access	public
 	 * @param	mixed
@@ -1085,7 +1085,7 @@ class CI_DB_active_record extends CI_DB_driver {
 		{
 			if ($this->db_debug)
 			{
-				//No valid data array. Folds in cases where keys and values did not match up
+				//No valid data array.  Folds in cases where keys and values did not match up
 				return $this->display_error('db_must_use_set');
 			}
 			return FALSE;
@@ -1125,7 +1125,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	// --------------------------------------------------------------------
 
 	/**
-	 * The "set_insert_batch" function. Allows key/value pairs to be set for batch inserts
+	 * The "set_insert_batch" function.  Allows key/value pairs to be set for batch inserts
 	 *
 	 * @access	public
 	 * @param	mixed
@@ -1159,7 +1159,7 @@ class CI_DB_active_record extends CI_DB_driver {
 
 			if ($escape === FALSE)
 			{
-				$this->ar_set[] = '('.implode(',', $row).')';
+				$this->ar_set[] =  '('.implode(',', $row).')';
 			}
 			else
 			{
@@ -1170,7 +1170,7 @@ class CI_DB_active_record extends CI_DB_driver {
 					$clean[] = $this->escape($value);
 				}
 
-				$this->ar_set[] = '('.implode(',', $clean).')';
+				$this->ar_set[] =  '('.implode(',', $clean).')';
 			}
 		}
 
@@ -1400,7 +1400,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	// --------------------------------------------------------------------
 
 	/**
-	 * The "set_update_batch" function. Allows key/value pairs to be set for batch updating
+	 * The "set_update_batch" function.  Allows key/value pairs to be set for batch updating
 	 *
 	 * @access	public
 	 * @param	array
@@ -1653,7 +1653,7 @@ class CI_DB_active_record extends CI_DB_driver {
 			return;
 		}
 
-		// Does the string contain a comma? If so, we need to separate
+		// Does the string contain a comma?  If so, we need to separate
 		// the string into discreet statements
 		if (strpos($table, ',') !== FALSE)
 		{
@@ -1683,7 +1683,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * Compile the SELECT statement
 	 *
 	 * Generates a query string based on which functions were used.
-	 * Should not be called directly. The get() function calls it.
+	 * Should not be called directly.  The get() function calls it.
 	 *
 	 * @access	private
 	 * @return	string
@@ -1993,7 +1993,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	// --------------------------------------------------------------------
 
 	/**
-	 * Resets the active record values. Called by the get() function
+	 * Resets the active record values.  Called by the get() function
 	 *
 	 * @access	private
 	 * @param	array	An array of fields to reset
@@ -2013,7 +2013,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	// --------------------------------------------------------------------
 
 	/**
-	 * Resets the active record values. Called by the get() function
+	 * Resets the active record values.  Called by the get() function
 	 *
 	 * @access	private
 	 * @return	void