Merge remote-tracking branch 'jiweigert/XHTML_1.0' into core68
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:47:43 +0000 (16:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:47:43 +0000 (16:47 +0100)
1  2 
config/cfgroot/header.pl
html/html/themes/ipfire/include/functions.pl
html/html/themes/maniac/include/functions.pl

index 91b54fc3879191e2df587231ae3080ad6c482fc4,7c3682021a24cc7bfc7f3443f69078727e2be177..0f10bf9f863b843cd70128a0a275cde218cb0101
@@@ -161,9 -161,10 +161,9 @@@ sub genmenu 
  
  sub showhttpheaders
  {
 -      print "Pragma: no-cache\n";
 -      print "Cache-control: no-cache\n";
 +      print "Cache-control: private\n";
        print "Connection: close\n";
-       print "Content-type: text/html\n\n";
+       print "Content-type: text/html; charset=UTF-8\n\n";
  }
  
  sub is_menu_visible($) {