diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/annotation/generic_comment.php | 4 | ||||
| -rw-r--r-- | views/default/object/plugin.php | 2 | ||||
| -rw-r--r-- | views/default/page/components/gallery.php | 5 | ||||
| -rw-r--r-- | views/default/page/components/list.php | 5 | ||||
| -rw-r--r-- | views/json/entities/entity_list.php | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index 2dcf7fefd..4a3407e1a 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -3,14 +3,14 @@ * Elgg generic comment view * * @uses $vars['annotation'] ElggAnnotation object - * @uses $vars['full'] Display fill view or brief view + * @uses $vars['full_view'] Display fill view or brief view */ if (!isset($vars['annotation'])) { return true; } -$full_view = elgg_extract('full', $vars, true); +$full_view = elgg_extract('full_view', $vars, true); $comment = $vars['annotation']; diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php index af1ccd677..2facca97a 100644 --- a/views/default/object/plugin.php +++ b/views/default/object/plugin.php @@ -11,7 +11,7 @@ $plugin = $vars['entity']; if (!$plugin->isValid()) { echo elgg_view('object/plugin/invalid', $vars); -} elseif ($vars['full']) { +} elseif ($vars['full_view']) { echo elgg_view('object/plugin/advanced', $vars); } else { echo elgg_view('object/plugin/simple', $vars); diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php index 8d3052ed9..1ba896836 100644 --- a/views/default/page/components/gallery.php +++ b/views/default/page/components/gallery.php @@ -23,11 +23,6 @@ $position = elgg_extract('position', $vars, 'after'); $num_columns = 4; -// @todo standardize on full_view - will require backward compatible code -if (isset($vars['full_view'])) { - $vars['full'] = $vars['full_view']; -} - if ($pagination && $count) { $nav .= elgg_view('navigation/pagination', array( 'offset' => $offset, diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php index 3a4fc21c8..ae951c89f 100644 --- a/views/default/page/components/list.php +++ b/views/default/page/components/list.php @@ -25,11 +25,6 @@ $pagination = elgg_extract('pagination', $vars, true); $offset_key = elgg_extract('offset_key', $vars, 'offset'); $position = elgg_extract('position', $vars, 'after'); -// @todo standardize on full_view - will require backward compatible code -if (isset($vars['full_view'])) { - $vars['full'] = $vars['full_view']; -} - $list_class = 'elgg-list'; if (isset($vars['list_class'])) { $list_class = "{$vars['list_class']} $list_class"; diff --git a/views/json/entities/entity_list.php b/views/json/entities/entity_list.php index f3d388f21..b583588c3 100644 --- a/views/json/entities/entity_list.php +++ b/views/json/entities/entity_list.php @@ -1,10 +1,10 @@ <?php $entities = $vars['entities']; -$fullview = $vars['fullview']; +$full_view = $vars['full_view']; if (is_array($entities) && sizeof($entities) > 0) { foreach($entities as $entity) { - echo elgg_view_entity($entity, $fullview); + echo elgg_view_entity($entity, $full_view); } } |