diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 836b375fb..ef42d0138 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -494,7 +494,6 @@ class DboSource extends DataSource { return $this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote; } if (preg_match('/^\w+\.\*$/', $data)) { // string.* - $items = explode('.', $data); return $this->startQuote . str_replace('.*', $this->endQuote . '.*', $data); } if (preg_match('/^(\w+)\((.*)\)$/', $data, $matches)) { // Functions diff --git a/cake/libs/set.php b/cake/libs/set.php index ef3728334..95275b45a 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -789,7 +789,7 @@ class Set { if (empty($val2)) { return (array)$val1; } - $intersection = array_intersect_key($val1,$val2); + $intersection = array_intersect_key($val1, $val2); while (list($key,) = each($intersection)) { if ($val1[$key] == $val2[$key]) { unset($val1[$key]);