Permalink
Browse files

Updating entity to concat arrays instead of merging, this makes it mo…

…re efficient.
  • Loading branch information...
1 parent e8c2c6a commit dae6dcd0e1e537cb1a7b02131da6ddbef5b5e795 @Howard3 Howard3 committed Jan 4, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 data/Entity.php
View
@@ -385,7 +385,7 @@ public function to($format, array $options = array()) {
case 'array':
$data = $this->_updated;
$rel = array_map(function($obj) { return $obj->data(); }, $this->_relationships);
- $data = Set::merge($data, $rel);
+ $data = $rel + $data;
$result = Collection::toArray($data, $options);
break;
default:

0 comments on commit dae6dcd

Please sign in to comment.