Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing auto merge issues.

  • Loading branch information...
commit 8b932358476fcd09bb154a5233734cfc813eae3b 1 parent 7a620b6
@markstory markstory authored
Showing with 0 additions and 1 deletion.
  1. +0 −1  cake/libs/model/datasources/dbo_source.php
View
1  cake/libs/model/datasources/dbo_source.php
@@ -1888,7 +1888,6 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
unset($fields[$i]);
continue;
}
- if (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
$fields[$i] = $fields[$i]->value;
} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
Please sign in to comment.
Something went wrong with that request. Please try again.