aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-10-29 13:15:26 -0400
committercash <cash.costello@gmail.com>2011-10-29 13:15:26 -0400
commit2649bcbfd4ab4f80ebfbfc28c6c476770aec09a1 (patch)
tree3351141a92b3658e9704656a41b33c07c02dc0b2
parente01240611f2a94d0a194235f2f83323049ad1a74 (diff)
downloadelgg-2649bcbfd4ab4f80ebfbfc28c6c476770aec09a1.tar.gz
elgg-2649bcbfd4ab4f80ebfbfc28c6c476770aec09a1.tar.bz2
Refs #3201 this finishes the updates on the JSON view
-rw-r--r--views/json/api/output.php3
-rw-r--r--views/json/entities/entity_list.php10
-rw-r--r--views/json/group/default.php2
-rw-r--r--views/json/object/default.php2
-rw-r--r--views/json/site/default.php2
-rw-r--r--views/json/user/default.php2
-rw-r--r--views/php/search/entity_list.php14
7 files changed, 5 insertions, 30 deletions
diff --git a/views/json/api/output.php b/views/json/api/output.php
index aab68f0dc..adeb7cc75 100644
--- a/views/json/api/output.php
+++ b/views/json/api/output.php
@@ -1,11 +1,10 @@
<?php
/**
* Elgg JSON output
- * This outputs the api as JSON
+ * This outputs the api results as JSON
*
* @package Elgg
* @subpackage Core
- *
*/
$result = $vars['result'];
diff --git a/views/json/entities/entity_list.php b/views/json/entities/entity_list.php
deleted file mode 100644
index d5b134a71..000000000
--- a/views/json/entities/entity_list.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$entities = $vars['entities'];
-$full_view = $vars['full_view'];
-
-if (is_array($entities) && sizeof($entities) > 0) {
- foreach ($entities as $entity) {
- echo elgg_view_entity($entity, array('full_view' => $full_view));
- }
-}
diff --git a/views/json/group/default.php b/views/json/group/default.php
index a01b215cc..0b168fdb2 100644
--- a/views/json/group/default.php
+++ b/views/json/group/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * JSON group view
*
* @package Elgg
* @subpackage Core
diff --git a/views/json/object/default.php b/views/json/object/default.php
index a01b215cc..d2e807621 100644
--- a/views/json/object/default.php
+++ b/views/json/object/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * JSON object view
*
* @package Elgg
* @subpackage Core
diff --git a/views/json/site/default.php b/views/json/site/default.php
index a01b215cc..7efd46939 100644
--- a/views/json/site/default.php
+++ b/views/json/site/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * JSON site view
*
* @package Elgg
* @subpackage Core
diff --git a/views/json/user/default.php b/views/json/user/default.php
index a01b215cc..e23472252 100644
--- a/views/json/user/default.php
+++ b/views/json/user/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * JSON user view
*
* @package Elgg
* @subpackage Core
diff --git a/views/php/search/entity_list.php b/views/php/search/entity_list.php
deleted file mode 100644
index c56874bdb..000000000
--- a/views/php/search/entity_list.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- echo elgg_view_entity($entity);
- }
-} \ No newline at end of file