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

This reverts commit 353f58c23149159306131b0819de713da6b69464.

Even though outputting UTF-8 by default at all times is a good thing,
it shouldn't be forced in startHTML().

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 64be745bebe85daa14998d451df7eb5bddda4701..c70f965376af91bea815d604b765ca469b9e2484 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
             }
         }
 
-        header('Content-Type: '.$type.'; charset=UTF-8');
+        header('Content-Type: '.$type);
 
         $this->extraHeaders();
         if (preg_match("/.*\/.*xml/", $type)) {

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