summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2010-05-04 14:55:22 (GMT)
committerDries Buytaert2010-05-04 14:55:22 (GMT)
commitd30e1588cf5bad32961501d970fa2b473651fbad (patch)
tree0145edc07052814a953293d5ff86ef5de4992d32
parent648d8ab87e89cde43bc142b0653ec7105c9fee54 (diff)
- Patch #341588 by voxpelli, mikl, dereine: drupal_json_output() must use correct mime-type.
-rw-r--r--includes/common.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index e99b231..398773e 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -4332,8 +4332,8 @@ function drupal_json_decode($var) {
* (optional) If set, the variable will be converted to JSON and output.
*/
function drupal_json_output($var = NULL) {
- // We are returning JavaScript, so tell the browser.
- drupal_add_http_header('Content-Type', 'text/javascript; charset=utf-8');
+ // We are returning JSON, so tell the browser.
+ drupal_add_http_header('Content-Type', 'application/json');
if (isset($var)) {
echo drupal_json_encode($var);