X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=e604998617e7ae7cf493faa40900881e54090380;hb=01323f127ddaf8eb9bd9b9d9ea8bcd6a6fd8a49e;hp=0f6b7d0e9fc8c0dda03506ff398da25900b17cf0;hpb=ef9ebe8ef9785b0fec3e3b20e70212e701f1c397;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 0f6b7d0..e604998 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -93,7 +93,11 @@ functionality. See L<Maypole> for these:
 
 sub get_request {
     my ($self, $r) = @_;
-    my $ar = ($MODPERL2) ? $r : Apache::Request->instance($r);
+    my $ar;
+    if ($MODPERL2) {
+    	$ar = eval {require Apache2::Request} ? Apache2::Request->new($r) : $r;
+	}
+    else { $ar = Apache::Request->instance($r); }
     $self->ar($ar);
 }
 
@@ -224,7 +228,7 @@ sub _mod_perl_args {
     } else {
       my $body = $self->_prepare_body($apr);
       %args = %{$body->param};
-      my $uri = URI->new($self->ar->uri);
+      my $uri = URI->new($self->ar->unparsed_uri);
       foreach my $key ($uri->query_param) {
 	if (ref $args{$key}) {
 	  push (@{$args{$key}}, $uri->query_param($key));