From dce2daddc42c27d5bf750c5b5db6ff34e6d9281f Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 13 Oct 2011 15:30:45 +1100 Subject: [PATCH] Revert "Upstream patch: Enable ORM to use column name in where clause" No longer required This reverts commit f272bc254d7d9eafd35e36ca02d07f1fe8ddf17a. --- .../database/classes/kohana/database/query/builder.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder.php b/includes/kohana/modules/database/classes/kohana/database/query/builder.php index bb55a595..8d36e790 100644 --- a/includes/kohana/modules/database/classes/kohana/database/query/builder.php +++ b/includes/kohana/modules/database/classes/kohana/database/query/builder.php @@ -114,11 +114,6 @@ abstract class Kohana_Database_Query_Builder extends Database_Query { { $value = $db->quote($value); } - elseif (is_string($value) AND preg_match('/^=/',$value)) - { - // Value is a column - $value = $db->quote_column(preg_replace('/^=/','',$value)); - } elseif ((is_string($value) AND array_key_exists($value, $this->_parameters)) === FALSE) { // Quote the value, it is not a parameter