wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x' into 0.9.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-09-30 10:54:17 +00:00
commit 7bd65a7b86
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/htmloutputter.php
View File

@ -106,14 +106,16 @@ class HTMLOutputter extends XMLOutputter
} }
} }
header('Content-Type: '.$type); header('Content-Type: '.$type.'; charset=UTF-8');
$this->extraHeaders(); $this->extraHeaders();
if( ! substr($type,0,strlen('text/html'))=='text/html' ){ if (preg_match("/.*\/.*xml/", $type)) {
// Browsers don't like it when <?xml it output for non-xhtml documents // Required for XML documents
$this->xw->startDocument('1.0', 'UTF-8'); $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(); $language = $this->getLanguage();

2
lib/util.php
View File

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