projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ecdef33
)
Fix overzealous search/replace
author
Coleman Watts
<coleman@civicrm.org>
Tue, 26 Aug 2014 06:23:34 +0000
(07:23 +0100)
committer
Coleman Watts
<coleman@civicrm.org>
Tue, 26 Aug 2014 06:23:34 +0000
(07:23 +0100)
CRM/Utils/JSON.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/JSON.php
b/CRM/Utils/JSON.php
index 3052403c25e33e41a916d09a5519956aaed0d838..00287a5eaab62c25176b42a434b76782f3ca6684 100644
(file)
--- a/
CRM/Utils/JSON.php
+++ b/
CRM/Utils/JSON.php
@@
-44,7
+44,8
@@
class CRM_Utils_JSON {
*/
static function output($input) {
header('Content-Type: application/json');
- CRM_Utils_JSON::output($input);
+ echo json_encode($input);
+ CRM_Utils_System::civiExit();
}
/**