Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/util.php b/lib/util.php
index d7af3f204..07e124811 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1390,7 +1390,7 @@ function common_negotiate_type($cprefs, $sprefs)
     }
 
     $bestq = 0;
-    $besttype = "text/html";
+    $besttype = 'text/html';
 
     foreach(array_keys($combine) as $type) {
         if($combine[$type] > $bestq) {
@@ -1399,6 +1399,9 @@ function common_negotiate_type($cprefs, $sprefs)
         }
     }
 
+    if ('text/html' === $besttype) {
+        return "text/html; charset=utf-8";
+    }
     return $besttype;
 }