Revert from() alias escaping fix - it was breaking more stuff

1 files changed, 3 insertions, 5 deletions

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 858ec356d..c71a6aa3a 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1267,12 +1267,10 @@ class CI_DB_driver {
 
 		// 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))
+		if (strpos($item, ' ') !== FALSE)
 		{
-			$item = $matches[1];
-
-			// Escape the alias
-			$alias = ' '.$matches[2].$this->_escape_identifiers($matches[3]);
+			$alias = strstr(' ', $item);
+			$item = substr($item, 0, - strlen($alias));
 		}
 		else
 		{