Merge branch '3.1/develop' into 3.2/develop

crowdfavorite · Jul 12, 2011 · ffc447e · ffc447e
2 parents 70dbbc0 + 10474ec
commit ffc447e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/kohana/database/query/builder.php b/classes/kohana/database/query/builder.php
@@ -120,8 +120,8 @@ protected function _compile_conditions(Database $db, array $conditions)
 					{
 						if (is_array($column))
 						{
-							// Use the column alias
-							$column = $db->quote_identifier(end($column));
+							// Use the column name
+							$column = $db->quote_identifier(reset($column));
 						}
 						else
 						{