Skip to content

Commit

Permalink
Merge pull request #25324 from braders/tidyup-double-return
Browse files Browse the repository at this point in the history
(REF) Tidy-up unreachable return
  • Loading branch information
eileenmcnaughton authored Jan 11, 2023
2 parents 9e31fde + ba5c63e commit d74bbd4
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CRM/Utils/REST.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ public static function output(&$result) {
if (!empty($requestParams['prettyprint'])) {
// Don't set content-type header for api explorer output
return json_encode(array_merge($result), JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES + JSON_UNESCAPED_UNICODE);
return self::jsonFormated(array_merge($result));
}
CRM_Utils_System::setHttpHeader('Content-Type', 'application/json');
return json_encode(array_merge($result));
Expand Down

0 comments on commit d74bbd4

Please sign in to comment.