X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FConfigLoader.pm;h=78a4af38cc5e6796fc547be9ac7ad9cd07e9806b;hb=6e7f9907fb0873332c04031fce097740f788e07b;hp=17880806690b23672d40ffa2d162c325c4b57128;hpb=d1b52b01f15a4e756ef35289099dc07487037caf;p=catagits%2FCatalyst-Plugin-ConfigLoader.git

diff --git a/lib/Catalyst/Plugin/ConfigLoader.pm b/lib/Catalyst/Plugin/ConfigLoader.pm
index 1788080..78a4af3 100644
--- a/lib/Catalyst/Plugin/ConfigLoader.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader.pm
@@ -73,18 +73,6 @@ sub setup {
 
             _fix_syntax( $config );
             
-            # merge hashes 1 level down
-            for my $key ( keys %$config ) {
-                if( exists $c->config->{ $key } ) {
-                    my $isa_ref = ref $config->{ $key };
-
-                    next if !$isa_ref or $isa_ref ne 'HASH';
-
-                    my %temp = ( %{ $c->config->{ $key } }, %{ $config->{ $key } } );
-                    $config->{ $key } = \%temp;
-                }
-            }
-            
             $c->config( $config );
         }
     }
@@ -172,7 +160,7 @@ sub _fix_syntax {
         grep {
             ref $config->{ lc $_ } || ref $config->{ $_ }
         }
-        qw( Component Model View Controller )
+        qw( Component Model M View V Controller C )
     );
 
     foreach my $comp ( @components ) {