X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=70f49fb488d8f1162c5ae48c56bf27658a14df55;hp=b0e4463185b864a22864a2aa1f7a93d72c4986c0;hb=199731fb710c6a165793f055f85de60539039dfe;hpb=97f38a92c64a340da3b9ca45aaacc09b2a59f345

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index b0e4463..70f49fb 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -574,15 +574,18 @@ sub prepare_query_parameters {
     my ($self, $c) = @_;
     my $env = $c->request->env;
     my $do_not_decode_query = $c->config->{do_not_decode_query};
-    my $default_query_encoding = $c->config->{default_query_encoding} || 
-      ($c->config->{decode_query_using_global_encoding} ?
-        $c->encoding : 'UTF-8');
 
+    my $old_encoding;
+    if(my $new = $c->config->{default_query_encoding}) {
+      $old_encoding = $c->encoding;
+      $c->encoding($new);
+    }
+
+    my $check = $c->config->{do_not_check_query_encoding} ? undef :$c->_encode_check;
     my $decoder = sub {
       my $str = shift;
       return $str if $do_not_decode_query;
-      return $str unless $default_query_encoding;
-      return decode( $default_query_encoding, $str);
+      return $c->_handle_param_unicode_decoding($str, $check);
     };
 
     my $query_string = exists $env->{QUERY_STRING}
@@ -598,7 +601,7 @@ sub prepare_query_parameters {
     for my $pair (@unsplit_pairs) {
         my ($name, $value)
           = map { defined $_ ? $decoder->($self->unescape_uri($_)) : $_ }
-            ( split /=/, $_, 2 )[0,1]; # slice forces two elements
+            ( split /=/, $pair, 2 )[0,1]; # slice forces two elements
 
         if ($is_first_pair) {
             # If the first pair has no equal sign, then it means the isindex
@@ -612,6 +615,7 @@ sub prepare_query_parameters {
     }
 
 
+    $c->encoding($old_encoding) if $old_encoding;
     $c->request->query_parameters( $c->request->_use_hash_multivalue ? $p : $p->mixed );
 }