forked from GNUsocial/gnu-social
trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls
This commit is contained in:
parent
3f0eb90128
commit
b6f0f72a09
@ -70,7 +70,7 @@ class ClientErrorAction extends ErrorAction
|
||||
417 => 'Expectation Failed');
|
||||
$this->default = 400;
|
||||
}
|
||||
|
||||
|
||||
// XXX: Should these error actions even be invokable via URI?
|
||||
|
||||
function handle($args)
|
||||
|
@ -67,7 +67,7 @@ class ServerErrorAction extends ErrorAction
|
||||
|
||||
$this->default = 500;
|
||||
}
|
||||
|
||||
|
||||
// XXX: Should these error actions even be invokable via URI?
|
||||
|
||||
function handle($args)
|
||||
|
@ -1391,7 +1391,7 @@ function common_negotiate_type($cprefs, $sprefs)
|
||||
}
|
||||
|
||||
$bestq = 0;
|
||||
$besttype = "text/html";
|
||||
$besttype = 'text/html';
|
||||
|
||||
foreach(array_keys($combine) as $type) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user