From: Barijaona Ramaholimihaso Date: Tue, 18 Sep 2007 02:09:06 +0000 (+0000) Subject: Reverted the 1.24 change. X-Git-Tag: v2_1_0~76 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=88501601fb05f3dda12473c6d3849f089da229a9;p=matthijs%2Fupstream%2Fblosxom.git Reverted the 1.24 change. --- diff --git a/blosxom.cgi b/blosxom.cgi index eef5b11..ad19c9a 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -338,6 +338,8 @@ else { my $content_type = (&$template($path_info,'content_type',$flavour)); $content_type =~ s!\n.*!!s; + $header = {-type=>$content_type}; + print generate('dynamic', $path_info, "$path_info_yr/$path_info_mo_num/$path_info_da", $flavour, $content_type); } @@ -376,10 +378,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)); @@ -514,7 +512,7 @@ sub nice_date { # Default HTML and RSS template bits __DATA__ -html content_type text/html; charset=$blog_encoding +html content_type text/html html head html head @@ -547,7 +545,7 @@ html foot html foot html foot -rss content_type text/xml ; charset=$blog_encoding +rss content_type text/xml rss head rss head