From eb85f16f773ff1df71d1af4fad85d40286d5f3a6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:37:46 +0000
Subject: [PATCH 1/3] Switched Doctype to XHTML 1.0 Strict (which best reflects
 the current grammar in use)

---
 lib/htmloutputter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index aa01f6b1d9..9e3a5b305e 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -113,7 +113,9 @@ class HTMLOutputter extends XMLOutputter
             // Browsers don't like it when <?xml it output for non-xhtml documents
             $this->xw->startDocument('1.0', 'UTF-8');
         }
-        $this->xw->writeDTD('html');
+        $this->xw->writeDTD('html',
+                            '-//W3C//DTD XHTML 1.0 Strict//EN',
+                            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 
         $language = $this->getLanguage();
 

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 2/3] 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;
 }

From 1e7df7fbab8a03468a1697240e92f67c82dadced Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:53:04 +0000
Subject: [PATCH 3/3] Better check to see if the XML prolog should be outputted
 for XML documents i.e., if best mimetype is */*xml, then use the XML prolog.

---
 lib/htmloutputter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 99f956545b..64be745beb 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -109,8 +109,8 @@ class HTMLOutputter extends XMLOutputter
         header('Content-Type: '.$type.'; charset=UTF-8');
 
         $this->extraHeaders();
-        if( ! substr($type,0,strlen('text/html'))=='text/html' ){
-            // Browsers don't like it when <?xml it output for non-xhtml documents
+        if (preg_match("/.*\/.*xml/", $type)) {
+            // Required for XML documents
             $this->xw->startDocument('1.0', 'UTF-8');
         }
         $this->xw->writeDTD('html',