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

2009-02-02 16:46:51 -05:00
parent daa5797809 b6f0f72a09
commit ab16bb876b
14 changed files with 27 additions and 13 deletions
--- 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;
 }