Fix TableRegistry::get() when merging pre-configuration options

cakephp · Jun 16, 2015 · 839a2be · 839a2be
1 parent c29c9e0
commit 839a2be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ORM/TableRegistry.php b/src/ORM/TableRegistry.php
@@ -184,7 +184,7 @@ public static function get($alias, array $options = [])
         }
 
         if (isset(static::$_config[$alias])) {
-            $options += static::$_config[$alias];
+            $options = array_merge($options, static::$_config[$alias]);
         }
         if (empty($options['connection'])) {
             $connectionName = $options['className']::defaultConnectionName();