Permalink
Browse files

Fixing auto merge issues.

  • Loading branch information...
1 parent 7a620b6 commit 8b932358476fcd09bb154a5233734cfc813eae3b @markstory markstory committed Dec 27, 2009
Showing with 0 additions and 1 deletion.
  1. +0 −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])){

0 comments on commit 8b93235

Please sign in to comment.