From 97d7421baea83266f611bcc3534840dd146cdec1 Mon Sep 17 00:00:00 2001
From: nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 18 May 2010 15:34:23 +0000
Subject: Updating the core JSON views to allow for proper object export.

git-svn-id: http://code.elgg.org/elgg/trunk@6086 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/json/canvas/default.php       |  7 +++++--
 views/json/page_shells/default.php  | 20 ++++++++++++++++++++
 views/json/pageshells/pageshell.php | 20 --------------------
 3 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 views/json/page_shells/default.php
 delete mode 100644 views/json/pageshells/pageshell.php

(limited to 'views/json')

diff --git a/views/json/canvas/default.php b/views/json/canvas/default.php
index a7df72778..b5ea51aa7 100644
--- a/views/json/canvas/default.php
+++ b/views/json/canvas/default.php
@@ -9,5 +9,8 @@
  * @link http://elgg.org/
  */
 
-
-global $jsonexport;
\ No newline at end of file
+for ($i = 1; $i < 8; $i++) {
+	if (isset($vars["area{$i}"])) {
+		echo $vars["area{$i}"];
+	}
+}
diff --git a/views/json/page_shells/default.php b/views/json/page_shells/default.php
new file mode 100644
index 000000000..16cfa3cdd
--- /dev/null
+++ b/views/json/page_shells/default.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Elgg JSON output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+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
diff --git a/views/json/pageshells/pageshell.php b/views/json/pageshells/pageshell.php
deleted file mode 100644
index 16cfa3cdd..000000000
--- a/views/json/pageshells/pageshell.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Elgg JSON output pageshell
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-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