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
/
Batch
/
Page
/
AJAX.php
diff --git
a/CRM/Batch/Page/AJAX.php
b/CRM/Batch/Page/AJAX.php
index 6c66b66bd2e940f561e6f03ecd0965b8596a9356..0bea0dcb5296468715c01bc77e60d2823577fdb1 100644
(file)
--- a/
CRM/Batch/Page/AJAX.php
+++ b/
CRM/Batch/Page/AJAX.php
@@
-114,6
+114,7
@@
class CRM_Batch_Page_AJAX {
'links',
);
}
+ header('Content-Type: application/json');
echo CRM_Utils_JSON::encodeDataTableSelector($batches, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
CRM_Utils_System::civiExit();
}