X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FMaypole.pm;h=1a86f53ad515c57afb82fa1d1b381f0abcb10b54;hp=8e24f8a8f13c0aeeb7ecee8d606a270b85309901;hb=dd425b2cb6384f804cc1eea9e45660ed6baeb2f1;hpb=ce73ea8b848572d33ad852e6b37f1c59ec5f9fc1

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 8e24f8a..1a86f53 100644
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -12,7 +12,7 @@ use URI::QueryParam;
 use NEXT;
 use File::MMagic::XS qw(:compat);
 
-our $VERSION = '2.121';
+our $VERSION = '2.13';
 our $mmagic = File::MMagic::XS->new();
 
 # proposed privacy conventions:
@@ -573,14 +573,17 @@ sub handler_guts {
   # We run additional_data for every request
   $self->additional_data;
 
+  # process request with model if applicable and template not set.
   if ($applicable) {
-    eval { $self->model_class->process($self) };
-    if ( my $error = $@ ) {
-      $status = $self->call_exception($error, "model");
-      if ( $status != OK ) {
-	$self->warn("caught model error: $error");
-	return $self->debug ? 
-	  $self->view_object->error($self, $error) : ERROR;
+    unless ($self->{template}) {
+      eval { $self->model_class->process($self) };
+      if ( my $error = $@ ) {
+	$status = $self->call_exception($error, "model");
+	if ( $status != OK ) {
+	  $self->warn("caught model error: $error");
+	  return $self->debug ? 
+	    $self->view_object->error($self, $error) : ERROR;
+	}
       }
     }
   } else {
@@ -613,7 +616,7 @@ my %filetypes = (
 sub __get_mime_type {
   my $self = shift;
   my $type = 'text/html';
-  if ($self->path =~ m/.*\.(\w{3,4})$/) {
+  if ($self->path =~ m/.*\.(\w{2,4})$/) {
     $type = $filetypes{$1};
   } else {
     my $output = $self->output;