clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

temporary merge response header into static *exit() methods because of compatibility issues

This commit is contained in:
Philipp 2022-01-02 23:21:52 +01:00
parent 9c8d9e83ac
commit 71272e07ee
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/System.php
View File

@ -315,7 +315,7 @@ class System
Logger::debug('Exit with error', ['code' => $val, 'message' => $message, 'callstack' => System::callstack(20), 'method' => $_SERVER['REQUEST_METHOD'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); Logger::debug('Exit with error', ['code' => $val, 'message' => $message, 'callstack' => System::callstack(20), 'method' => $_SERVER['REQUEST_METHOD'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
} }
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $message); header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $message);
DI::page()->exit(DI::apiResponse()->generate());
echo $content; echo $content;
exit(); exit();
@ -342,6 +342,7 @@ class System
* @param integer $options JSON options * @param integer $options JSON options
*/ */
public static function jsonExit($x, $content_type = 'application/json', int $options = 0) { public static function jsonExit($x, $content_type = 'application/json', int $options = 0) {
DI::page()->exit(DI::apiResponse()->generate());
header("Content-type: $content_type"); header("Content-type: $content_type");
echo json_encode($x, $options); echo json_encode($x, $options);
exit(); exit();