summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-09-30 10:54:17 +0000
committerSarven Capadisli <csarven@status.net>2009-09-30 10:54:17 +0000
commit7bd65a7b86d7d694d28e81f7d6897cbefd9d9e1d (patch)
tree40047bf30685cd9657d4a64cb97f3388589992c2 /lib/util.php
parentfe7848e8b87b6a3f44fc8b7a58f79812d197dec2 (diff)
parent1e7df7fbab8a03468a1697240e92f67c82dadced (diff)
Merge branch '0.8.x' into 0.9.x
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index d249b154f..44a377220 100644
--- 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;
}