aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/views.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-27 01:31:44 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-27 01:31:44 +0000
commit53062715e71e7ce4bf6310731dc1ec102fb87f1c (patch)
treea96ddce25b832b59927567290ba490794848cc6f /engine/lib/views.php
parent41616b6f4bbbc8f495a321c89cf62b0d39938ec5 (diff)
downloadelgg-53062715e71e7ce4bf6310731dc1ec102fb87f1c.tar.gz
elgg-53062715e71e7ce4bf6310731dc1ec102fb87f1c.tar.bz2
Fixes #3086 using full_view instead of full
git-svn-id: http://code.elgg.org/elgg/trunk@8866 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/views.php')
-rw-r--r--engine/lib/views.php24
1 files changed, 12 insertions, 12 deletions
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,
)
);