We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 7bd65a7b authored by Sarven Capadisli's avatar Sarven Capadisli

Merge branch '0.8.x' into 0.9.x

parents fe7848e8 1e7df7fb
......@@ -106,14 +106,16 @@ 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' ){
// Browsers don't like it when <?xml it output for non-xhtml documents
if (preg_match("/.*\/.*xml/", $type)) {
// Required for XML documents
$this->xw->startDocument('1.0', 'UTF-8');
}
$this->xw->writeDTD('html');
$this->xw->writeDTD('html',
'-//W3C//DTD XHTML 1.0 Strict//EN',
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
$language = $this->getLanguage();
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment