aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engine/lib/users.php6
-rw-r--r--engine/lib/views.php24
-rw-r--r--mod/blog/views/default/object/blog.php2
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php2
-rw-r--r--mod/file/views/default/file/specialcontent/image/default.php2
-rw-r--r--mod/file/views/default/object/file.php2
-rw-r--r--mod/groups/lib/groups.php2
-rw-r--r--mod/groups/views/default/group/default.php2
-rw-r--r--mod/groups/views/default/object/groupforumtopic.php2
-rw-r--r--mod/messageboard/views/default/annotation/messageboard.php2
-rw-r--r--mod/messages/views/default/object/messages.php2
-rw-r--r--mod/pages/pages/pages/revision.php2
-rw-r--r--mod/pages/views/default/object/page_top.php8
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--views/default/annotation/generic_comment.php4
-rw-r--r--views/default/object/plugin.php2
-rw-r--r--views/default/page/components/gallery.php5
-rw-r--r--views/default/page/components/list.php5
-rw-r--r--views/json/entities/entity_list.php4
19 files changed, 35 insertions, 45 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 987762576..1d0429760 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -507,7 +507,7 @@ $timelower = 0, $timeupper = 0) {
* @param int $user_guid The GUID of the user
* @param string $subtype The object subtype
* @param int $limit The number of entities to display on a page
- * @param bool $fullview Whether or not to display the full view (default: true)
+ * @param bool $full_view Whether or not to display the full view (default: true)
* @param bool $listtypetoggle Whether or not to allow you to flip to gallery mode (default: true)
* @param bool $pagination Whether to display pagination (default: true)
* @param int $timelower The earliest time the entity can have been created. Default: all
@@ -515,7 +515,7 @@ $timelower = 0, $timeupper = 0) {
*
* @return string The list in a form suitable to display
*/
-function list_user_friends_objects($user_guid, $subtype = "", $limit = 10, $fullview = true,
+function list_user_friends_objects($user_guid, $subtype = "", $limit = 10, $full_view = true,
$listtypetoggle = true, $pagination = true, $timelower = 0, $timeupper = 0) {
$offset = (int) get_input('offset');
@@ -525,7 +525,7 @@ $listtypetoggle = true, $pagination = true, $timelower = 0, $timeupper = 0) {
$entities = get_user_friends_objects($user_guid, $subtype, $limit, $offset,
$timelower, $timeupper);
- return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview,
+ return elgg_view_entity_list($entities, $count, $offset, $limit, $full_view,
$listtypetoggle, $pagination);
}
diff --git a/engine/lib/views.php b/engine/lib/views.php
index cdb3e0bad..89d5c99b5 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -756,7 +756,7 @@ function elgg_view_menu($menu_name, array $vars = array()) {
* - ElggEntity 'entity' The entity being viewed
*
* Other common view $vars paramters:
- * - bool 'full' Whether to show a full or condensed view.
+ * - bool 'full_view' Whether to show a full or condensed view.
*
* @tip This function can automatically appends annotations to entities if in full
* view and a handler is registered for the entity:annotate. See {@trac 964} and
@@ -785,7 +785,7 @@ function elgg_view_entity(ElggEntity $entity, $vars = array(), $bypass = true, $
$autofeed = true;
$defaults = array(
- 'full' => false,
+ 'full_view' => false,
);
if (is_array($vars)) {
@@ -793,7 +793,7 @@ function elgg_view_entity(ElggEntity $entity, $vars = array(), $bypass = true, $
} else {
elgg_deprecated_notice("Update your use of elgg_view_entity()", 1.8);
$vars = array(
- 'full' => $vars,
+ 'full_view' => $vars,
);
}
@@ -822,8 +822,8 @@ function elgg_view_entity(ElggEntity $entity, $vars = array(), $bypass = true, $
}
// Marcus Povey 20090616 : Speculative and low impact approach for fixing #964
- if ($vars['full']) {
- $annotations = elgg_view_entity_annotations($entity, $vars['full']);
+ if ($vars['full_view']) {
+ $annotations = elgg_view_entity_annotations($entity, $vars['full_view']);
if ($annotations) {
$contents .= $annotations;
@@ -889,20 +889,20 @@ function elgg_view_entity_icon(ElggEntity $entity, $size = 'medium', $vars = arr
* - ElggEntity 'annotation' The annotation being viewed.
*
* @param ElggAnnotation $annotation The annotation to display
- * @param bool $full Display the full view
+ * @param bool $full_view Display the full view?
* @param bool $bypass If false, will not pass to a custom
* template handler. {@see set_template_handler()}
* @param bool $debug Complain if views are missing
*
* @return string HTML (etc) to display
*/
-function elgg_view_annotation(ElggAnnotation $annotation, $full = true, $bypass = true, $debug = false) {
+function elgg_view_annotation(ElggAnnotation $annotation, $full_view = true, $bypass = true, $debug = false) {
global $autofeed;
$autofeed = true;
$params = array(
'annotation' => $annotation,
- 'full' => $full,
+ 'full_view' => $full_view,
);
$view = $annotation->view;
@@ -1037,13 +1037,13 @@ function elgg_view_annotation_list($annotations, array $vars = array()) {
*
* This is called automatically by the framework from {@link elgg_view_entity()}
*
- * @param ElggEntity $entity Entity
- * @param bool $full Full view?
+ * @param ElggEntity $entity Entity
+ * @param bool $full_view Display full view?
*
* @return mixed string or false on failure
* @todo Change the hook name.
*/
-function elgg_view_entity_annotations(ElggEntity $entity, $full = true) {
+function elgg_view_entity_annotations(ElggEntity $entity, $full_view = true) {
if (!$entity) {
return false;
}
@@ -1057,7 +1057,7 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full = true) {
$annotations = elgg_trigger_plugin_hook('entity:annotate', $entity_type,
array(
'entity' => $entity,
- 'full' => $full,
+ 'full_view' => $full_view,
)
);
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index b68f869d6..048a68a1a 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -5,7 +5,7 @@
* @package Blog
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$blog = elgg_extract('entity', $vars, FALSE);
if (!$blog) {
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 15e775738..5605e7277 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -5,7 +5,7 @@
* @package ElggBookmarks
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$bookmark = elgg_extract('entity', $vars, FALSE);
if (!$bookmark) {
diff --git a/mod/file/views/default/file/specialcontent/image/default.php b/mod/file/views/default/file/specialcontent/image/default.php
index 8ae251cfc..fbd994a0b 100644
--- a/mod/file/views/default/file/specialcontent/image/default.php
+++ b/mod/file/views/default/file/specialcontent/image/default.php
@@ -7,7 +7,7 @@ $image_url = elgg_get_site_url() . "mod/file/thumbnail.php?file_guid={$vars['ent
$image_url = elgg_format_url($image_url);
$download_url = elgg_get_site_url() . "mod/file/download.php?file_guid={$vars['entity']->getGUID()}";
-if ($vars['full'] && $smallthumb = $vars['entity']->smallthumb) {
+if ($vars['full_view'] && $smallthumb = $vars['entity']->smallthumb) {
echo <<<HTML
<div class="file-photo">
<a href="$download_url"><img class="elgg-photo" src="$image_url" /></a>
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 02befd44c..0b58ca76f 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -5,7 +5,7 @@
* @package ElggFile
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$file = elgg_extract('entity', $vars, FALSE);
if (!$file) {
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index cfab11ebb..c0a8a9a94 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -29,7 +29,7 @@ function groups_handle_all_page() {
'subtype' => 'groupforumtopic',
'order_by' => 'e.last_action desc',
'limit' => 40,
- 'fullview' => false,
+ 'full_view' => false,
));
break;
case 'newest':
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 252a01ef0..1f1035a38 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -21,7 +21,7 @@ if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
}
-if ($vars['full']) {
+if ($vars['full_view']) {
echo elgg_view("groups/profile/profile_block", $vars);
} else {
// brief view
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 9c01dd83a..9589d1fb8 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -5,7 +5,7 @@
* @package ElggGroups
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$topic = elgg_extract('entity', $vars, FALSE);
if (!$topic) {
diff --git a/mod/messageboard/views/default/annotation/messageboard.php b/mod/messageboard/views/default/annotation/messageboard.php
index 595cc6db4..8dfba3a22 100644
--- a/mod/messageboard/views/default/annotation/messageboard.php
+++ b/mod/messageboard/views/default/annotation/messageboard.php
@@ -3,7 +3,7 @@
* Message board post
*
* @uses $vars['annotation'] ElggAnnotation object
- * @uses $vars['full'] Display fill view or brief view
+ * @uses $vars['full_view'] Display fill view or brief view
*/
$vars['delete_action'] = 'action/messageboard/delete';
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index 196d8a3ad..b52b86a3a 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -5,7 +5,7 @@
* @package ElggFile
*/
-$full = elgg_extract('full', $vars, false);
+$full = elgg_extract('full_view', $vars, false);
$message = elgg_extract('entity', $vars, false);
if (!$message) {
diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php
index 968c64b58..f542f5201 100644
--- a/mod/pages/pages/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
@@ -38,7 +38,7 @@ elgg_push_breadcrumb(elgg_echo('pages:revision'));
$content = elgg_view('object/page_top', array(
'entity' => $page,
'revision' => $annotation,
- 'full' => true,
+ 'full_view' => true,
));
$sidebar = elgg_view('pages/sidebar/history', array('page' => $page));
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 591028562..756c542b4 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -4,13 +4,13 @@
*
* @package ElggPages
*
- * @uses $vars['entity'] The page object
- * @uses $vars['full'] Whether to display the full view
- * @uses $vars['revision'] This parameter not supported by elgg_view_entity()
+ * @uses $vars['entity'] The page object
+ * @uses $vars['full_view'] Whether to display the full view
+ * @uses $vars['revision'] This parameter not supported by elgg_view_entity()
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$page = elgg_extract('entity', $vars, FALSE);
$revision = elgg_extract('revision', $vars, FALSE);
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index ace290589..bcc62f816 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -6,7 +6,7 @@
*/
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
$post = elgg_extract('entity', $vars, FALSE);
if (!$post) {
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);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 21:59:06 +0000