X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=4fcd8dfde15de7eab8fac55ea4905ae219470ccb;hb=565851cab66df8310b76a59e0b5bf462edf90feb;hp=044c1a7c7adfc657ce01f2c80b0827e7c9f4b1ca;hpb=4a54e35a96e2863e809fddbf22450d60745661f1;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 044c1a7..4fcd8df 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -30,6 +30,7 @@ sub parse_location {
     my $loc = $self->{ar}->location;
     no warnings 'uninitialized';
     $self->{path} =~ s/^($loc)?\///;
+    $self->rewrite_path;
     $self->parse_path;
     $self->parse_args;
 }
@@ -42,7 +43,8 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    $r->{ar}->content_type( $r->{content_type} );
+    $r->{ar}->content_type(
+        $r->{content_type} . "; encoding=" . $r->{document_encoding} );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
@@ -74,8 +76,8 @@ Apache::MVC - Apache front-end to Maypole
     package BeerDB;
     use base 'Apache::MVC';
     BeerDB->setup("dbi:mysql:beerdb");
-    BeerDB->config->{uri_base} = "http://your.site/";
-    BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+    BeerDB->config->uri_base("http://your.site/");
+    BeerDB->config->display_tables([qw[beer brewery pub style]]);
     # Now set up your database:
     # has-a relationships
     # untaint columns