Merge remote-tracking branch 'origin/master'

Umisoft · Jul 30, 2014 · 2d7f660 · 2d7f660
2 parents 42d692b + 4cc36b5
commit 2d7f660
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/orm/collection/CollectionManager.php b/library/orm/collection/CollectionManager.php
@@ -101,7 +101,7 @@ public function getCollection($collectionName)
         $config = $this->collections[$collectionName];
 
         try {
-            $config = $this->configToArray($config, true);
+            $config = $this->configToArray($config);
         } catch (\InvalidArgumentException $e) {
             throw new UnexpectedValueException($this->translate(
                 'Configuration for collection "{collection}" is not valid.',