X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=a71f65594bd2de9e61a09b1aa6c9e0a7355b8765;hb=14b0dab3b4ba38d8de513a46d902a0eca4068841;hp=41be15784dd762fd05e8c15f315aac6f5e5e25ed;hpb=46cb9323ef6bdb9e678a67e9bbd1533b785b9b3e;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 41be157..a71f655 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.90110';
+our $VERSION = '5.90112';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
 sub import {
@@ -2490,6 +2490,7 @@ sub prepare {
     };
 
     $c->log_request;
+    $c->{stash} = $c->stash;
 
     return $c;
 }
@@ -3654,6 +3655,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);