Add $blog_encoding back to default content_type flavours, and simple content_type...

[matthijs/upstream/blosxom.git] / blosxom.cgi

diff --git a/blosxom.cgi b/blosxom.cgi
index eef5b113ae7ce0965b9c8cb0a4e20589d5d8d961..1ddc9dfdd461883d1fd8c6ed1f26477c5502ba60 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -338,6 +338,9 @@ else {
   my $content_type = (&$template($path_info,'content_type',$flavour));
   $content_type =~ s!\n.*!!s;
 
+  $content_type =~ s/(\$\w+(?:::)?\w*)/"defined $1 ? $1 : ''"/gee;
+  $header = {-type=>$content_type};
+
   print generate('dynamic', $path_info, "$path_info_yr/$path_info_mo_num/$path_info_da", $flavour, $content_type);
 }
 
@@ -376,10 +379,6 @@ sub generate {
     # override the default built-in interpolate subroutine
     my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('interpolate') and defined($tmp = $plugin->interpolate()) and $interpolate = $tmp and last; }
         
-    # Content_type
-    $content_type=&$interpolate($content_type);
-    $header = {-type=>$content_type};
-
     # Head
     my $head = (&$template($currentdir,'head',$flavour));
   
@@ -547,7 +546,7 @@ html foot         </center>
 html foot     </body>
 html foot </html>
 
-rss content_type text/xml ; charset=$blog_encoding
+rss content_type text/xml; charset=$blog_encoding
 
 rss head <?xml version="1.0" encoding="$blog_encoding"?>
 rss head <rss version="2.0">