From 353f58c23149159306131b0819de713da6b69464 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:51:59 +0000
Subject: [PATCH] Outputting UTF-8 charset in document header irrespective of
 mimetype.

---
 lib/htmloutputter.php | 2 +-
 lib/util.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 9e3a5b305e..99f956545b 100644
--- 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 b831859e99..a069ccf7b3 100644
--- 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;
 }
-- 
2.39.5