From d9947c840bbce291c1cf3f0cb73f0c343686892e Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 13 Jun 2012 21:32:22 +0200
Subject: Revert "Fix issue #1387"

This reverts commit bc602d8b8e125597bfd557949e846ff5a258b858.

This break the session cleanup.

References:
https://github.com/EllisLab/CodeIgniter/issues/1387#issuecomment-6307876

Conflicts:
	user_guide/changelog.html

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 system/database/DB_active_rec.php |  4 ++--
 system/database/DB_driver.php     | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'system')

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 10febb1fc..841ede28e 100755
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -255,7 +255,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	 */
 	public function from($from)
 	{
-		foreach ((array) $from as $val)
+		foreach ((array)$from as $val)
 		{
 			if (strpos($val, ',') !== FALSE)
 			{
@@ -1647,7 +1647,7 @@ class CI_DB_active_record extends CI_DB_driver {
 		if (strpos($table, " ") !== FALSE)
 		{
 			// if the alias is written with the AS keyword, remove it
-			$table = preg_replace('/\s+AS\s+/i', ' ', $table);
+			$table = preg_replace('/ AS /i', ' ', $table);
 
 			// Grab the alias
 			$table = trim(strrchr($table, " "));
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index c25752824..6161f149b 100755
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1263,20 +1263,15 @@ class CI_DB_driver {
 		}
 
 		// Convert tabs or multiple spaces into single spaces
-		$item = preg_replace('/\s+/', ' ', $item);
+		$item = preg_replace('/[\t ]+/', ' ', $item);
 
 		// If the item has an alias declaration we remove it and set it aside.
 		// Basically we remove everything to the right of the first space
-		if (preg_match('/^([^\s]+) (AS )*(.+)$/i', $item, $matches))
+		$alias = '';
+		if (strpos($item, ' ') !== FALSE)
 		{
-			$item = $matches[1];
-
-			// Escape the alias
-			$alias = ' '.$matches[2].$this->escape_identifiers($matches[3]);
-		}
-		else
-		{
-			$alias = '';
+			$alias = strstr($item, " ");
+			$item = substr($item, 0, - strlen($alias));
 		}
 
 		// This is basically a bug fix for queries that use MAX, MIN, etc.
@@ -1392,7 +1387,7 @@ class CI_DB_driver {
 
 		return $item.$alias;
 	}
-
+	
 	// --------------------------------------------------------------------
 
 	/**
@@ -1400,13 +1395,16 @@ class CI_DB_driver {
 	 *
 	 * This function is used extensively by every db driver.
 	 *
+	 * @access	private
 	 * @return	void
 	 */
 	protected function _reset_select()
 	{
+	
 	}
 
 }
 
+
 /* End of file DB_driver.php */
-/* Location: ./system/database/DB_driver.php */
\ No newline at end of file
+/* Location: ./system/database/DB_driver.php */
-- 
cgit v1.2.3-24-g4f1b