projects / matthijs / upstream / blosxom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e509dde)
Add $blog_encoding back to default content_type flavours, and simple content_type...
authorGavin Carr <gonzai@users.sourceforge.net>
Tue, 18 Sep 2007 05:29:26 +0000 (05:29 +0000)
committerGavin Carr <gonzai@users.sourceforge.net>
Tue, 18 Sep 2007 05:29:26 +0000 (05:29 +0000)
blosxom.cgi patch | blob | history

diff --git a/blosxom.cgi b/blosxom.cgi
index ad19c9a196b65ba0f7b73000b98bad4104c4f126..1ddc9dfdd461883d1fd8c6ed1f26477c5502ba60 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -338,6 +338,7 @@ 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);
@@ -512,7 +513,7 @@ sub nice_date {
 
 # Default HTML and RSS template bits
 __DATA__
-html content_type text/html
+html content_type text/html; charset=$blog_encoding
 
 html head <html>
 html head     <head>
@@ -545,7 +546,7 @@ html foot         </center>
 html foot     </body>
 html foot </html>
 
-rss content_type text/xml
+rss content_type text/xml; charset=$blog_encoding
 
 rss head <?xml version="1.0" encoding="$blog_encoding"?>
 rss head <rss version="2.0">
Blosxom blogging script repository with my patches