X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=a94388f6589a69679dec6dca0a027461b87b7528;hb=0810283f5e3c710d09ab56ceb8fb0b6bfbe3bbe9;hp=93b6fe9b20869130c9de0a606eae55880d0e4ee8;hpb=1893c1946e7cc5bb493241d8c9e783a02147f8b4;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm old mode 100755 new mode 100644 index 93b6fe9..a94388f --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -127,7 +127,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90069_004'; +our $VERSION = '5.90075'; sub import { my ( $class, @arguments ) = @_; @@ -3071,6 +3071,7 @@ sub _handle_unicode_decoding { return unless defined $value; + ## I think this mess is to support the old nested if ( ref $value eq 'ARRAY' ) { foreach ( @$value ) { $_ = $self->_handle_unicode_decoding($_); @@ -3090,6 +3091,8 @@ sub _handle_unicode_decoding { sub _handle_param_unicode_decoding { my ( $self, $value ) = @_; + return unless defined $value; # not in love with just ignoring undefs - jnap + my $enc = $self->encoding; return try { Encode::is_utf8( $value ) ?