adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing auto merge issues.

Browse source
This commit is contained in:
Mark Story 2009-12-27 12:45:34 -05:00
parent 7a620b62b0
commit 8b93235847
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1888,7 +1888,6 @@ class DboSource extends DataSource {
unset($fields[$i]); unset($fields[$i]);
continue; continue;
} }
if (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') { if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
$fields[$i] = $fields[$i]->value; $fields[$i] = $fields[$i]->value;
} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){ } elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){