projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34
[civicrm-core.git]
/
CRM
/
Mailing
/
Page
/
AJAX.php
diff --git
a/CRM/Mailing/Page/AJAX.php
b/CRM/Mailing/Page/AJAX.php
index 60e7d43e193c1a2b89190bb3c3b4aeb339c4c873..5a0fef0788c1378a0f8053f682f4477cc5a3ec8e 100644
(file)
--- a/
CRM/Mailing/Page/AJAX.php
+++ b/
CRM/Mailing/Page/AJAX.php
@@
-104,6
+104,7
@@
class CRM_Mailing_Page_AJAX {
'links',
);
+ header('Content-Type: application/json');
echo CRM_Utils_JSON::encodeDataTableSelector($mailings, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
CRM_Utils_System::civiExit();
}