1 files changed, 19 insertions, 20 deletions
diff --git a/views/json/export/metadata.php b/views/json/export/metadata.php
index 30caf8b85..e1e6ceb26 100644
--- a/views/json/export/metadata.php
+++ b/views/json/export/metadata.php
@@ -1,22 +1,21 @@
 <?php
-	/**
-	 * Elgg metadata export.
-	 * Displays a metadata item using json
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg metadata export.
+ * Displays a metadata item using json
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
 
-	$m = $vars['metadata'];
-	
-	$export = new stdClass;
-	
-	foreach ($m as $k => $v)
-		$export->$k = $v;
-		
-	echo json_encode($export);
-?>
-\ No newline at end of file
+$m = $vars['metadata'];
+
+$export = new stdClass;
+$exportable_values = $entity->getExportableValues();
+
+foreach ($exportable_values as $v) {
+	$export->$v = $m->$v;
+}
+
+global $jsonexport;
+$jsonexport['metadata'][] = $entity;
+// echo json_encode($export);
+\ No newline at end of file