Revert "Outputting UTF-8 charset in document header irrespective of mimetype."

This reverts commit 353f58c231.

Even though outputting UTF-8 by default at all times is a good thing,
it shouldn't be forced in startHTML().
This commit is contained in:
Sarven Capadisli 2009-10-01 10:07:09 +00:00
parent c5be2962ad
commit cc776478e2
2 changed files with 2 additions and 2 deletions

View File

@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
} }
} }
header('Content-Type: '.$type.'; charset=UTF-8'); header('Content-Type: '.$type);
$this->extraHeaders(); $this->extraHeaders();
if (preg_match("/.*\/.*xml/", $type)) { if (preg_match("/.*\/.*xml/", $type)) {

View File

@ -1165,7 +1165,7 @@ function common_negotiate_type($cprefs, $sprefs)
} }
if ('text/html' === $besttype) { if ('text/html' === $besttype) {
return "text/html"; return "text/html; charset=utf-8";
} }
return $besttype; return $besttype;
} }