fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Be more consistent about JSON responses

Browse source 
cf. #152
This commit is contained in:
Kijin Sung 2020-10-08 13:25:46 +09:00
parent 7cede70de0
commit 8cabb88dbb
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/display/DisplayHandler.class.php
View file

@ -100,7 +100,7 @@ class DisplayHandler extends Handler
// header output // header output
$httpStatusCode = $oModule->getHttpStatusCode(); $httpStatusCode = $oModule->getHttpStatusCode();
if($httpStatusCode !== 200 && !in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK'))) if($httpStatusCode !== 200 && !in_array(Context::getResponseMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK')))
{ {
self::_printHttpStatusCode($httpStatusCode); self::_printHttpStatusCode($httpStatusCode);
} }
@ -108,10 +108,7 @@ class DisplayHandler extends Handler
{ {
if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK' || isset($_POST['_rx_ajax_compat'])) if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK' || isset($_POST['_rx_ajax_compat']))
{ {
if(strpos($_SERVER['HTTP_ACCEPT'], 'json') !== false) self::_printJSONHeader();
{
self::_printJSONHeader();
}
} }
elseif(Context::getResponseMethod() == 'XMLRPC') elseif(Context::getResponseMethod() == 'XMLRPC')
{ {