Relocate config options merge

cakephp · Jun 16, 2015 · c4a2eaa · c4a2eaa
1 parent 0a5bad6
commit c4a2eaa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/ORM/TableRegistry.php b/src/ORM/TableRegistry.php
@@ -169,6 +169,10 @@ public static function get($alias, array $options = [])
         list(, $classAlias) = pluginSplit($alias);
         $options = ['alias' => $classAlias] + $options;
 
+        if (isset(static::$_config[$alias])) {
+            $options += static::$_config[$alias];
+        }
+
         if (empty($options['className'])) {
             $options['className'] = Inflector::camelize($alias);
         }
@@ -183,9 +187,6 @@ public static function get($alias, array $options = [])
             $options['className'] = 'Cake\ORM\Table';
         }
 
-        if (isset(static::$_config[$alias])) {
-            $options = static::$_config[$alias] + $options;
-        }
         if (empty($options['connection'])) {
             $connectionName = $options['className']::defaultConnectionName();
             $options['connection'] = ConnectionManager::get($connectionName);