Merge branch 'release' into stable

pull/10/merge wp-1.8.1
Frode Petterson 2017-04-18 15:36:08 +02:00
commit 41cee98970
1 changed files with 0 additions and 4 deletions

View File

@ -2778,10 +2778,6 @@ class H5PCore {
* @param null|int $status_code Http response code * @param null|int $status_code Http response code
*/ */
private static function printJson($data, $status_code = NULL) { private static function printJson($data, $status_code = NULL) {
if ($status_code !== NULL) {
http_response_code($status_code);
}
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');
print json_encode($data); print json_encode($data);