adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-08 12:32:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
This commit is contained in:
mark_story 2012-11-02 16:52:51 -04:00
commit 60f9626838
20 changed files with 289 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Cake/Model/Datasource/DboSource.php
View file

@ -2489,16 +2489,16 @@ class DboSource extends DataSource {
$count = count($value);
if ($count === 1 && !preg_match("/\s+NOT$/", $key)) {
$data = $this->_quoteFields($key) . ' = (';
} else {
$data = $this->_quoteFields($key) . ' IN (';
}
if ($quoteValues) {
if (is_object($model)) {
$columnType = $model->getColumnType($key);
if ($quoteValues) {
if (is_object($model)) {
$columnType = $model->getColumnType($key);
}
$data .= implode(', ', $this->value($value, $columnType));
}
$data .= implode(', ', $this->value($value, $columnType));
$data .= ')';
} else {
$data = $this->_parseKey($model, $key, $value);
}
$data .= ')';
} else {
$ret = $this->conditionKeysToString($value, $quoteValues, $model);
if (count($ret) > 1) {