Merge branch '0.8.x' into 0.9.x

2009-09-30 10:54:17 +00:00
parent fe7848e8b8 1e7df7fbab
commit 7bd65a7b86
2 changed files with 7 additions and 5 deletions
--- 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; charset=utf-8";
+        return "text/html";
    }
    return $besttype;
 }