X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=46e0df61bba40d9c1e9f700f1eaa9c6f1a1aeccb;hb=3e22baa5ca02859b9180a0ec17d49fd204f5ba37;hp=f9ff7b327d4e4f968dd6315a6c42ad6c7f892bcb;hpb=bd917b94298b00325cb9db7551897c2471ca78ff;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm index f9ff7b3..46e0df6 100644 --- a/lib/Catalyst/Request.pm +++ b/lib/Catalyst/Request.pm @@ -5,6 +5,8 @@ use base 'Class::Accessor::Fast'; use IO::Socket qw[AF_INET inet_aton]; use Carp; +use utf8; +use URI::QueryParam; __PACKAGE__->mk_accessors( qw/action address arguments cookies headers match method @@ -66,7 +68,7 @@ Catalyst::Request - provides information about the current client request $req->user; $req->user_agent; -See also L. +See also L, L. =head1 DESCRIPTION @@ -502,10 +504,17 @@ sub uri_with { carp( 'No arguments passed to uri_with()' ) unless $args; + for my $value ( values %$args ) { + my $isa_ref = ref $value; + if( $isa_ref and $isa_ref ne 'ARRAY' ) { + croak( "Non-array reference ($isa_ref) passed to uri_with()" ); + } + utf8::encode( $_ ) for $isa_ref ? @$value : $value; + }; my $uri = $self->uri->clone; $uri->query_form( { - $uri->query_form, + %{ $uri->query_form_hash }, %$args } ); return $uri;