From a0c4d2783ae1876dc4b062b7a8d4b6c3a96dc760 Mon Sep 17 00:00:00 2001 From: gwoo Date: Thu, 19 Jun 2008 16:15:49 +0000 Subject: [PATCH] removing redundant $not from previous commit git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7216 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/datasources/dbo_source.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index ae58929e3..3919e14ca 100644 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -1760,19 +1760,19 @@ class DboSource extends DataSource { } $value = $this->conditionKeysToString($value, $quoteValues, $model); + if (strpos($join, 'NOT') !== false) { if (strtoupper(trim($key)) == 'NOT') { $key = 'AND ' . trim($key); } $not = 'NOT '; - } else { - $not = null; } + if (empty($value[1])) { if ($not) { $out[] = $not . '(' . $value[0] . ')'; } else { - $out[] = $not . $value[0] ; + $out[] = $value[0] ; } } else { $out[] = '(' . $not . '(' . join(') ' . strtoupper($key) . ' (', $value) . '))';