X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=d93707fcd26f0c6c52b191687f125f150d1fedb0;hp=25b2c7a317fcfa2b5744b4b4c82706d5f90b2db3;hb=8327e2e21fc9ea72c357e876f868001ad9712474;hpb=b248fa4a4191cd3eaa13d72e6ec8e64dfef973e0

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 25b2c7a..d93707f 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -717,12 +717,15 @@ sub uri_for {
     $namespace = '' if $path =~ /^\//;
     $path =~ s/^\///;
 
+    my $params = (scalar @args && ref $args[$#args] eq 'HASH' ? pop @args : {});
+
     # join args with '/', or a blank string
     my $args = ( scalar @args ? '/' . join( '/', @args ) : '' );
     $args =~ s/^\/// unless $path;
     my $res =
       URI->new_abs( URI->new_abs( "$path$args", "$basepath$namespace" ), $base )
       ->canonical;
+    $res->query_form(%$params);
     $res;
 }