Outputting UTF-8 charset in document header irrespective of mimetype.

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 9e3a5b305e5fa89be55e25d7fc4a2c4b8c54603a..99f956545b9486914da4a67511fead66daa1ade9 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
             }
         }
 
-        header('Content-Type: '.$type);
+        header('Content-Type: '.$type.'; charset=UTF-8');
 
         $this->extraHeaders();
         if( ! substr($type,0,strlen('text/html'))=='text/html' ){

diff --git a/lib/util.php b/lib/util.php
index b831859e993392d14de493f3ae349d9e61e919e2..a069ccf7b36ae5dca3e19fcb1dd092ffb5c006f3 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -1148,7 +1148,7 @@ function common_negotiate_type($cprefs, $sprefs)
     }
 
     if ('text/html' === $besttype) {
-        return "text/html; charset=utf-8";
+        return "text/html";
     }
     return $besttype;
 }