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

trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls

Browse Source
This commit is contained in:
Robin Millette 2009-02-02 21:08:33 +00:00 committed by Robin Millette
parent 3f0eb90128
commit b6f0f72a09
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/clienterroraction.php
View File

@ -70,7 +70,7 @@ class ClientErrorAction extends ErrorAction
417 => 'Expectation Failed'); 417 => 'Expectation Failed');
$this->default = 400; $this->default = 400;
} }
// XXX: Should these error actions even be invokable via URI? // XXX: Should these error actions even be invokable via URI?
function handle($args) function handle($args)

2
lib/servererroraction.php
View File

@ -67,7 +67,7 @@ class ServerErrorAction extends ErrorAction
$this->default = 500; $this->default = 500;
} }
// XXX: Should these error actions even be invokable via URI? // XXX: Should these error actions even be invokable via URI?
function handle($args) function handle($args)

5
lib/util.php
View File

@ -1391,7 +1391,7 @@ function common_negotiate_type($cprefs, $sprefs)
} }
$bestq = 0; $bestq = 0;
$besttype = "text/html"; $besttype = 'text/html';
foreach(array_keys($combine) as $type) { foreach(array_keys($combine) as $type) {
if($combine[$type] > $bestq) { if($combine[$type] > $bestq) {
@ -1400,6 +1400,9 @@ function common_negotiate_type($cprefs, $sprefs)
} }
} }
if ('text/html' === $besttype) {
return "text/html; charset=utf-8";
}
return $besttype; return $besttype;
} }