X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=219a7c15dddbfc951e872aa05448d2aaef2d5d23;hb=593246961dbb8d7b2f64da822ebb5749d3b0337d;hp=4f85d247c162dc7a83a7734091f74e70a9eaae79;hpb=3338e8ce4213037e529ce849ef9d205ff369f5c9;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm index 4f85d24..219a7c1 100644 --- a/lib/Catalyst/Request.pm +++ b/lib/Catalyst/Request.pm @@ -510,14 +510,14 @@ sub uri_with { my( $self, $args ) = @_; 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()" ); + for ( ref $value eq 'ARRAY' ? @$value : $value ) { + $_ = "$_"; + utf8::encode( $_ ); } - utf8::encode( $_ ) for grep{ defined } $isa_ref ? @$value : $value; }; + my $uri = $self->uri->clone; $uri->query_form( {