diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-04 14:55:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-04 14:55:22 +0000 |
| commit | d30e1588cf5bad32961501d970fa2b473651fbad (patch) | |
| tree | 0145edc07052814a953293d5ff86ef5de4992d32 /includes | |
| parent | 648d8ab87e89cde43bc142b0653ec7105c9fee54 (diff) | |
| download | brdo-d30e1588cf5bad32961501d970fa2b473651fbad.tar.gz brdo-d30e1588cf5bad32961501d970fa2b473651fbad.tar.bz2 | |
- Patch #341588 by voxpelli, mikl, dereine: drupal_json_output() must use correct mime-type.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index e99b2319c..398773eb9 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); |