Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-29 17:26:40 +01:00
Code Issues Packages Projects Releases Activity

Use $grav->exit() instead of exit()

Browse Source
This commit is contained in:
Matias Griese
2019-06-03 13:17:16 +03:00
parent ed41aabe85
commit f4d5ccf731
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
classes/plugin/AdminBaseController.php
View File

@@ -14,6 +14,7 @@ use Grav\Common\User\Interfaces\UserInterface;
use Grav\Common\Utils;
use Grav\Common\Plugin;
use Grav\Common\Theme;
use Grav\Framework\Psr7\Response;
use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\File\File;
@@ -208,24 +209,22 @@ class AdminBaseController
/**
* Sends JSON response and terminates the call.
*
* @param array $response
* @param array $json
* @param int $code
* @return bool
*/
protected function sendJsonResponse(array $response, $code = 200)
protected function sendJsonResponse(array $json, $code = 200): void
{
// Make sure nothing extra gets written to the response.
while (ob_get_level()) {
ob_end_clean();
}
// JSON response.
http_response_code($code);
header('Content-Type: application/json');
header('Cache-Control: no-cache, no-store, must-revalidate');
$response = new Response(
$code,
[
'Content-Type' => 'application/json',
'Cache-Control' => 'no-cache, no-store, must-revalidate'
],
json_encode($json)
);
echo json_encode($response);
exit();
$this->grav->exit($response);
}
/**