summaryrefslogtreecommitdiff
path: root/modules/rest/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/rest/helpers')
-rw-r--r--modules/rest/helpers/rest.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 64a32d40..22c13be9 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -60,9 +60,12 @@ class rest_Core {
if (!empty($message)) {
$response["message"] = (string)$message;
}
+ if ($response_data) {
+ $response = array_merge($response, $response_data);
+ }
// We don't need to save the session for this request
Session::abort_save();
- return json_encode(array_merge($response, $response_data));
+ return json_encode($response);
}
private static function _format_response($message, $log_message) {