X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=5eb1e4d96240f34616bc69b9337c5f0517a7e5cf;hb=5789e96979492b0755c18158a9dcb7e12aee5895;hp=f7eb317280b187ad15c6c24f4964742defc3ad34;hpb=b8e9dfcaf46ec9995b91b7c433c44de3c38a00dc;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index f7eb317..5eb1e4d 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -6,9 +6,9 @@ use warnings;
 use base 'Maypole';
 use mod_perl;
 
-use constant APACHE2	=> $mod_perl::VERSION >= 1.99;
+use constant APACHE2 => $mod_perl::VERSION >= 1.99;
 
-if ( APACHE2 ) {
+if (APACHE2) {
     require Apache2;
     require Apache::RequestRec;
     require Apache::RequestUtil;
@@ -42,7 +42,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 +75,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