From 9e4446fe5f096d9ec729c3fd482c59000b13417c Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 13 Sep 2014 21:50:35 -0400 Subject: [PATCH] Trim whitespace from columns before checking for operators. Fixes #4599 --- lib/Cake/Model/Datasource/DboSource.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index 3505a49d68a..861c8104db2 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -2743,10 +2743,11 @@ protected function _parseKey($key, $value, Model $Model = null) { $operatorMatch .= ')\\x20?)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is'; $bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false)); + $key = trim($key); if (strpos($key, ' ') === false) { $operator = '='; } else { - list($key, $operator) = explode(' ', trim($key), 2); + list($key, $operator) = explode(' ', $key, 2); if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) { $key = $key . ' ' . $operator;