X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FContainer.pm;h=7e72c8655bf3133a2690b10ef20e360957551752;hb=6682389c3c6a9a856dea70722ff851d05250f8ad;hp=b9ae62e5648146d447da521d1c6cd6a0ac5b2d58;hpb=ffc0b0d89b5926350cf41ea00c7e71e6546149a5;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Container.pm b/lib/Catalyst/Container.pm index b9ae62e..7e72c86 100644 --- a/lib/Catalyst/Container.pm +++ b/lib/Catalyst/Container.pm @@ -226,7 +226,7 @@ sub _fix_syntax { } sub _config_substitutions { - my ($self, $name, $subs) = @_; + my ( $self, $name, $subs, $arg ) = @_; $subs->{ HOME } ||= sub { shift->path_to( '' ); }; $subs->{ ENV } ||= @@ -244,11 +244,8 @@ sub _config_substitutions { $subs->{ literal } ||= sub { return $_[ 1 ]; }; my $subsre = join( '|', keys %$subs ); - for ( @_ ) { - my $arg = $_; - $arg =~ s{__($subsre)(?:\((.+?)\))?__}{ $subs->{ $1 }->( $name, $2 ? split( /,/, $2 ) : () ) }eg; - return $arg; - } + $arg =~ s{__($subsre)(?:\((.+?)\))?__}{ $subs->{ $1 }->( $name, $2 ? split( /,/, $2 ) : () ) }eg; + return $arg; } 1;