Refs #3085 moved full_view out of elgg_view_list_item() into $vars to be consistent...

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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index a66b7748b7c3fbd2b27b4e83d26f43849508d648..27abf8f8e835dd1599190f7ce26b1147fa32ecae 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1247,7 +1247,6 @@ function elgg_view_form($action, $form_vars = array(), $body_vars = array()) {
  * View an item in a list
  *
  * @param object $item      ElggEntity or ElggAnnotation
- * @param bool   $full_view Whether to render the full view of the object
  * @param array  $vars      Additional parameters for the rendering
  *
  * @return string
@@ -1255,6 +1254,9 @@ function elgg_view_form($action, $form_vars = array(), $body_vars = array()) {
  * @access private
  */
 function elgg_view_list_item($item, $full_view, array $vars = array()) {
+
+       $full_view = elgg_extract('full_view', $vars, false);
+
        switch ($item->getType()) {
                case 'user':
                case 'object':

diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index f57cc99baa96eacb0eaec662c347ec618ee37ced..c6764d92ff4bdd6c40488eadf2894379344ce556 100644 (file)
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -18,7 +18,6 @@ $offset = $vars['offset'];
 $limit = $vars['limit'];
 $count = $vars['count'];
 $pagination = elgg_extract('pagination', $vars, true);
-$full_view = elgg_extract('full_view', $vars, false);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
 
@@ -50,7 +49,7 @@ foreach ($items as $item) {
        $col++;
 
        echo '<td>';
-       echo elgg_view_list_item($item, $full_view, $vars);
+       echo elgg_view_list_item($item, $vars);
        echo "</td>";
 
        if ($col == $num_columns) {

diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index 374922ecde8347b957c752313f4cc3cdabd9c5c6..ae951c89fdb39bc286647e3f8967e0a47c1e5f5d 100644 (file)
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -22,7 +22,6 @@ $limit = $vars['limit'];
 $count = $vars['count'];
 $base_url = $vars['base_url'];
 $pagination = elgg_extract('pagination', $vars, true);
-$full_view = elgg_extract('full_view', $vars, false);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
 
@@ -58,7 +57,7 @@ if (is_array($items) && count($items) > 0) {
                        $id = "item-{$item->getType()}-{$item->id}";
                }
                $html .= "<li id=\"$id\" class=\"$item_class\">";
-               $html .= elgg_view_list_item($item, $full_view, $vars);
+               $html .= elgg_view_list_item($item, $vars);
                $html .= '</li>';
        }
        $html .= '</ul>';

diff --git a/views/rss/layout/objects/list.php b/views/rss/layout/objects/list.php
index 9892d27798dc139384f89ca14dd8b5bf271dc413..2650fc0064d40e8743ae1c54a85d5632d1075573 100644 (file)
--- a/views/rss/layout/objects/list.php
+++ b/views/rss/layout/objects/list.php
@@ -6,10 +6,9 @@
  */
 
 $items = $vars['items'];
-$full_view = elgg_extract('full_view', $vars, false);
 
 if (is_array($items) && sizeof($items) > 0) {
        foreach ($items as $item) {
-               echo elgg_view_list_item($item, $full_view, $vars);
+               echo elgg_view_list_item($item, $vars);
        }
 }
\ No newline at end of file