Removing duplicated condition from merge.

cakephp · Mar 4, 2010 · 3e27549 · 3e27549
1 parent 382e11c
commit 3e27549
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -475,9 +475,6 @@ function name($data) {
 		if ($data === '*') {
 			return '*';
 		}
-		if (is_object($data) && isset($data->type)) {
-			return $data->value;
-		}
 		if (is_array($data)) {
 			foreach ($data as $i => $dataItem) {
 				$data[$i] = $this->name($dataItem);