From 93e99d5a0080f6ef89192b7d406e013a3b9fe48f Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 4 Feb 2009 18:44:54 +0000
Subject: JSON feeds now work. Fixes #716

git-svn-id: https://code.elgg.org/elgg/trunk@2650 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/json/pageshells/pageshell.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'views/json/pageshells/pageshell.php')

diff --git a/views/json/pageshells/pageshell.php b/views/json/pageshells/pageshell.php
index d9cb52b9b..ae51b49e5 100644
--- a/views/json/pageshells/pageshell.php
+++ b/views/json/pageshells/pageshell.php
@@ -10,7 +10,14 @@
 	 * @link http://elgg.org/
 	 * 
 	 */
-
-	header("Content-Type: application/json");
-	echo $vars['body'];
+
+	if(stristr($_SERVER["HTTP_ACCEPT"],"application/json")) { 
+		header("Content-Type: application/json");		
+	} else {
+		header("Content-Type: application/javascript");
+	}
+	// echo $vars['body'];
+	
+	global $jsonexport;
+	echo json_encode($jsonexport);
 ?>
\ No newline at end of file
-- 
cgit v1.2.3