adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing redundant $not from previous commit

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7216 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-06-19 16:15:49 +00:00
parent 7d06612b35
commit a0c4d2783a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/model/datasources/dbo_source.php
View file

@ -1760,19 +1760,19 @@ class DboSource extends DataSource {
} }
$value = $this->conditionKeysToString($value, $quoteValues, $model); $value = $this->conditionKeysToString($value, $quoteValues, $model);
if (strpos($join, 'NOT') !== false) { if (strpos($join, 'NOT') !== false) {
if (strtoupper(trim($key)) == 'NOT') { if (strtoupper(trim($key)) == 'NOT') {
$key = 'AND ' . trim($key); $key = 'AND ' . trim($key);
} }
$not = 'NOT '; $not = 'NOT ';
} else {
$not = null;
} }
if (empty($value[1])) { if (empty($value[1])) {
if ($not) { if ($not) {
$out[] = $not . '(' . $value[0] . ')'; $out[] = $not . '(' . $value[0] . ')';
} else { } else {
$out[] = $not . $value[0] ; $out[] = $value[0] ;
} }
} else { } else {
$out[] = '(' . $not . '(' . join(') ' . strtoupper($key) . ' (', $value) . '))'; $out[] = '(' . $not . '(' . join(') ' . strtoupper($key) . ' (', $value) . '))';