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

Merge branch 'mergers' into 1.2-merger

Browse source 
Conflicts:
	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
This commit is contained in:
mark_story 2009-12-06 22:03:17 -05:00
commit 24b636cc71
25 changed files with 1402 additions and 969 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1933,7 +1933,7 @@ class DboSource extends DataSource {
} else {
$data = $this->__quoteFields($key) . ' IN (';
}
if ($quoteValues || strpos($value[0], '-!') !== 0) {
if ($quoteValues) {
if (is_object($model)) {
$columnType = $model->getColumnType($key);
}