diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/users.php | 6 | ||||
| -rw-r--r-- | engine/lib/views.php | 24 |
2 files changed, 15 insertions, 15 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, ) ); |