X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView.pm;h=7ff04509331810c793b70ea8fa945aaa12929c4f;hb=ba3c3e8604014602dee49df10bacaecdfce180a0;hp=51ff5d41836048a9f8746f7d0b68ddda6afce221;hpb=a8dc76a1260561f17e6513a243473967582ed48a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/View.pm b/lib/Catalyst/View.pm index 51ff5d4..7ff0450 100644 --- a/lib/Catalyst/View.pm +++ b/lib/Catalyst/View.pm @@ -1,7 +1,7 @@ package Catalyst::View; -use strict; -use base qw/Catalyst::Component/; +use Moose; +extends qw/Catalyst::Component/; =head1 NAME @@ -52,26 +52,9 @@ Merges two hashes together recursively, giving right-hand precedence. =cut -sub merge_config_hashes { - my ( $self, $lefthash, $righthash ) = @_; - - my %merged = %$lefthash; - for my $key ( keys %$righthash ) { - my $right_ref = ( ref $righthash->{ $key } || '' ) eq 'HASH'; - my $left_ref = ( ( exists $lefthash->{ $key } && ref $lefthash->{ $key } ) || '' ) eq 'HASH'; - if( $right_ref and $left_ref ) { - $merged{ $key } = $self->merge_config_hashes( - $lefthash->{ $key }, $righthash->{ $key } - ); - } - } -} - +=head1 AUTHORS -=head1 AUTHOR - -Sebastian Riedel, C -Marcus Ramberg, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT @@ -80,4 +63,7 @@ the same terms as Perl itself. =cut +no Moose; +__PACKAGE__->meta->make_immutable(); + 1;