JSON feeds now work. Fixes #716

git-svn-id: https://code.elgg.org/elgg/trunk@2650 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 14 insertions, 7 deletions

diff --git a/views/json/export/entity.php b/views/json/export/entity.php
index 3b0ce8367..c5369eea1 100644
--- a/views/json/export/entity.php
+++ b/views/json/export/entity.php
@@ -11,13 +11,16 @@
 	 * @link http://elgg.org/
 	 */
 
-	$entity = $vars['entity'];
+	$entity = $vars['entity'];

 	
 	$export = new stdClass;
 	$exportable_values = $entity->getExportableValues();
 	
 	foreach ($exportable_values as $v)
-		$export->$v = $entity->$v;
-		
-	echo json_encode($export);
+		$export->$v = $entity->$v;

+		

+	$export->url = $entity->getURL();
+		

+	global $jsonexport;
+	$jsonexport[$entity->getType()][$entity->getSubtype()][] = $export;
 ?>
\ No newline at end of file
diff --git a/views/json/export/metadata.php b/views/json/export/metadata.php
index 273051d22..d1a5a44d8 100644
--- a/views/json/export/metadata.php
+++ b/views/json/export/metadata.php
@@ -18,6 +18,8 @@
 	
 	foreach ($exportable_values as $v)
 		$export->$v = $m->$v;
-		
-	echo json_encode($export);
+		

+	global $jsonexport;

+	$jsonexport['metadata'][] = $entity;
+	// echo json_encode($export);
 ?>
\ No newline at end of file
diff --git a/views/json/export/relationship.php b/views/json/export/relationship.php
index 1c255ad4d..4b5006d73 100644
--- a/views/json/export/relationship.php
+++ b/views/json/export/relationship.php
@@ -20,5 +20,7 @@
 	foreach ($exportable_values as $v)
 		$export->$v = $r->$v;
 		
-	echo json_encode($export);
+	global $jsonexport;

+	$jsonexport['relationships'][] = $export;

+	
 ?>
\ No newline at end of file