summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-02 15:46:29 -0400
committerEvan Prodromou <evan@status.net>2009-10-02 15:46:29 -0400
commit6f4c3a6b690dd79cabd4d7529d797fb9e3d504c6 (patch)
treeb02c5a2231c491330ccbd86b31f0fe70e08f2f51 /lib/util.php
parent2d85d619074b69ff0d31249c45715af686b13986 (diff)
parent1e7df7fbab8a03468a1697240e92f67c82dadced (diff)
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.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 b831859e9..a069ccf7b 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;
}