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 unreachable code

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7793 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-10-29 06:44:15 +00:00
parent 7b224b29eb
commit 8ede5d21d3
1 changed files with 3 additions and 5 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

@ -1728,10 +1728,9 @@ class DboSource extends DataSource {
} }
if (is_array($conditions) && !empty($conditions)) { if (is_array($conditions) && !empty($conditions)) {
if (!empty($conditions)) {
$out = $this->conditionKeysToString($conditions, $quoteValues, $model); $out = $this->conditionKeysToString($conditions, $quoteValues, $model);
}
if (empty($out) || empty($conditions)) { if (empty($out)) {
return $clause . ' 1 = 1'; return $clause . ' 1 = 1';
} }
return $clause . join(' AND ', $out); return $clause . join(' AND ', $out);
@ -1785,7 +1784,6 @@ class DboSource extends DataSource {
} else { } else {
$key = $join; $key = $join;
} }
$value = $this->conditionKeysToString($value, $quoteValues, $model); $value = $this->conditionKeysToString($value, $quoteValues, $model);
if (strpos($join, 'NOT') !== false) { if (strpos($join, 'NOT') !== false) {