aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-09-04 17:23:02 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-09-04 17:23:02 -0700
commit4d21b6d4567b91b127818e90e7c9c9c4d26d27c0 (patch)
treef9415dc6bcb4c1fc901e199d86ba1fc3738ff8ec /engine
parentc3d0cf509298298159db0ca75a71aa3676c548e5 (diff)
parentd17dbe2591868bf2834c5f2ecef502b03a698d8d (diff)
downloadelgg-4d21b6d4567b91b127818e90e7c9c9c4d26d27c0.tar.gz
elgg-4d21b6d4567b91b127818e90e7c9c9c4d26d27c0.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/actions.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 4ccffd267..99e22e104 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -446,7 +446,17 @@ function ajax_forward_hook($hook, $type, $reason, $params) {
$params['status'] = -1;
}
- header("Content-type: application/json");
+ // Check the requester can accept JSON responses, if not fall back to
+ // returning JSON in a plain-text response. Some libraries request
+ // JSON in an invisible iframe which they then read from the iframe,
+ // however some browsers will not accept the JSON MIME type.
+ if (stripos($_SERVER['HTTP_ACCEPT'], 'application/json') === FALSE) {
+ header("Content-type: text/plain");
+ }
+ else {
+ header("Content-type: application/json");
+ }
+
echo json_encode($params);
exit;
}