simplify configuration merge

mojolicious · Feb 22, 2014 · e4fb6f5 · e4fb6f5
1 parent 78637fd
commit e4fb6f5
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/Mojolicious/Plugin/Config.pm b/lib/Mojolicious/Plugin/Config.pm
@@ -51,10 +51,7 @@ sub register {
   # Merge everything
   $config = {%$config, %{$self->load($mode, $conf, $app)}} if $mode;
   $config = {%{$conf->{default}}, %$config} if $conf->{default};
-  my $current = $app->defaults(config => $app->config)->config;
-  %$current = (%$current, %$config);
-
-  return $current;
+  return $app->defaults(config => $app->config)->config($config)->config;
 }
 
 1;