Permalink
Browse files

Removed some monkey patching

  • Loading branch information...
lorenzo committed Feb 5, 2014
1 parent 49f19d2 commit d60d7f1fe56ad5ee6615f0458076e102484a2df9
Showing with 1 addition and 6 deletions.
  1. +1 −6 src/ORM/EagerLoader.php
View
@@ -97,12 +97,6 @@ public function contain($associations = []) {
}
$associations = (array)$associations;
- $current = current($associations);
- if (is_array($current) && isset($current['instance'])) {
- $this->_containments = $this->_normalized = $associations;
- return;
- }
-
$associations = $this->_reformatContain($associations, $this->_containments);
$this->_normalized = $this->_loadExternal = null;
return $this->_containments = $associations;
@@ -204,6 +198,7 @@ protected function _reformatContain($associations, $original) {
}
if (is_array($options)) {
+ $options = isset($options['config']) ? $options['config'] : $options;
$options = $this->_reformatContain($options, []);
}

0 comments on commit d60d7f1

Please sign in to comment.