Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Return array instead of null from api

Browse Source 
[MAILPOET-2518]
This commit is contained in:
Pavel Dohnal
2020-07-14 10:25:23 +02:00
committed by Veljko V
parent 5de4985da2
commit 405476cb7b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/API/JSON/Response.php
View File

@ -30,14 +30,13 @@ abstract class Response {
if (!empty($this->meta)) { if (!empty($this->meta)) {
$response['meta'] = $this->meta; $response['meta'] = $this->meta;
} }
if ($data !== null) { if ($data === null) {
$response = array_merge($response, $data); $data = [];
} }
$response = array_merge($response, $data);
if (!empty($response)) { @header('Content-Type: application/json; charset=' . get_option('blog_charset'));
@header('Content-Type: application/json; charset=' . get_option('blog_charset')); echo WPFunctions::get()->wpJsonEncode($response);
echo WPFunctions::get()->wpJsonEncode($response);
}
die(); die();
} }

2
lib/API/JSON/SuccessResponse.php
View File

@ -11,7 +11,7 @@ class SuccessResponse extends Response {
} }
public function getData() { public function getData() {
if ($this->data === null) return null; if ($this->data === null) return [];
return [ return [
'data' => $this->data, 'data' => $this->data,