Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44

[civicrm-core.git] / CRM / Custom / Page / AJAX.php

diff --git a/CRM/Custom/Page/AJAX.php b/CRM/Custom/Page/AJAX.php
index b4bc680cb04dab4ed46c3ad98a640e70a509c134..eabe16f097f1ec00e46ef4abb7fe1307949e2257 100644 (file)
--- a/CRM/Custom/Page/AJAX.php
+++ b/CRM/Custom/Page/AJAX.php
@@ -62,7 +62,7 @@ class CRM_Custom_Page_AJAX {
       'class',
     );
 
-    header('Content-Type: application/json');
+    CRM_Utils_System::setHttpHeader('Content-Type', 'application/json');
     echo CRM_Utils_JSON::encodeDataTableSelector($options, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
     CRM_Utils_System::civiExit();
   }