summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-09-30 10:51:59 +0000
committerSarven Capadisli <csarven@status.net>2009-09-30 10:51:59 +0000
commit353f58c23149159306131b0819de713da6b69464 (patch)
tree7bacccfca8d462f1e19c73a35b10a52ccbe8bde6
parenteb85f16f773ff1df71d1af4fad85d40286d5f3a6 (diff)
Outputting UTF-8 charset in document header irrespective of mimetype.
-rw-r--r--lib/htmloutputter.php2
-rw-r--r--lib/util.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 9e3a5b305..99f956545 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
}
}
- header('Content-Type: '.$type);
+ header('Content-Type: '.$type.'; charset=UTF-8');
$this->extraHeaders();
if( ! substr($type,0,strlen('text/html'))=='text/html' ){
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;
}