Skip to content
Permalink
Browse files

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

  • Loading branch information...
codeguy committed Jun 16, 2015
1 parent c29c9e0 commit 839a2be756b73e8d34a30e797f6a8291d85aa029
Showing with 1 addition and 1 deletion.
  1. +1 −1 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();

0 comments on commit 839a2be

Please sign in to comment.
You can’t perform that action at this time.