X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=cd53311d95f6a0bf5a56e916d930b9fee12becf2;hb=e669e88a53601a58917a17f6bec1822262225ab6;hp=0df44fdce225f6caf356252aae220ac262342040;hpb=fc42a730483499b9ee26ac068ba1c40794b05ebe;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm index 0df44fd..cd53311 100644 --- a/lib/Catalyst/Request.pm +++ b/lib/Catalyst/Request.pm @@ -6,6 +6,7 @@ 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 @@ -508,12 +509,12 @@ sub uri_with { 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 ; + 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;