X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=e68e18cb3f92738bfa7dd59c75052c9fcb8c332c;hp=880bf40e366e6999f02ba750fe8abce22c08a9a0;hb=d7325e05db00f4eff6b1520368c9c2bda5ab931c;hpb=7374d0c8847553be888890636435e142608fff48 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 880bf40..e68e18c 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -204,7 +204,7 @@ sub composed_stats_class { __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90106'; +our $VERSION = '5.90112'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases sub import { @@ -3654,6 +3654,9 @@ sub _handle_param_unicode_decoding { return $value if blessed($value); #don't decode when the value is an object. my $enc = $self->encoding; + + return $value unless $enc; # don't decode if no encoding is specified + $check ||= $self->_encode_check; return try { $enc->decode( $value, $check);