Fixes #3086 using full_view instead of full

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

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 9877625768a4a5c10a87c8bf0c640f78055b427e..1d0429760f3d88f78d11bc3c265843c02d851d3b 100644 (file)
--- 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 cdb3e0bade5a9aec7aae726c5d7ffeff3fd74376..89d5c99b5527d54c8c76d667e9279b171d3ffef5 100644 (file)
--- 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 b68f869d6ab3d5c8d65d0e117795741bef97e2d0..048a68a1ab4e91de0938c8cb41f4a1a017966d63 100644 (file)
--- 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 15e77573887a6e19839fb6c5336dc37cef1626af..5605e7277575cfd1856381970b52578416cdfcc2 100644 (file)
--- 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 8ae251cfcd1e4b13fb14a7e1e1c320dbb1cbf0ea..fbd994a0b22f7b2c65e3e1b07af7aa049e1c7282 100644 (file)
--- 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 02befd44c2c8fcfe818f40dee1dcc31380bd45fe..0b58ca76f6cbbc742ad1889e76f018a61b0cee0f 100644 (file)
--- 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 cfab11ebbe8d416dab091ff817dc66dd2cc8cdbb..c0a8a9a94f91c99ad7b5263c22beb871c5aca9b0 100644 (file)
--- 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 252a01ef04c978514edc0448c63ce7b9b07d22ee..1f1035a3893a4704900bc172b5372e2266619c82 100644 (file)
--- 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 9c01dd83a22be8a4c32f7732764c1040dd4ce462..9589d1fb8cd8fc5d5d53b6b3f828379308615ec0 100644 (file)
--- 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 595cc6db4cb8c021751c3228dc9e0e37551dcb9a..8dfba3a22c1aa86b07e42cdaf9baf79e89f8167a 100644 (file)
--- 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 196d8a3ad7acf92611ad9a022a5ebaea877d7d71..b52b86a3a573ba647685de021866f456f0efca0b 100644 (file)
--- 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 968c64b5850a4da9e3402eee65913c6688987dce..f542f5201e40a2c667fcb132ac04e83c900e3fd3 100644 (file)
--- 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 5910285624841da3fb29106538c5d9098b0b63c8..756c542b4e05906aac57530206f6f1b2f50044c6 100644 (file)
--- 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 ace290589311bf1913095c9246144c32371427e7..bcc62f8166efcf9b1a514eac61e0674d7631aa2f 100644 (file)
--- 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 2dcf7fefd100a9f5142519db844f4348fe844860..4a3407e1a102f8ff1471905594f9e0c18930a39d 100644 (file)
--- 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 af1ccd677d5b82e8f4715862db246d5bf49af49c..2facca97a9269203c9640bcef8e19c24f4e78423 100644 (file)
--- 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 8d3052ed9950477d4b0297b5e5c847e486f678d1..1ba8968364ec7ee2936b42fd9f6fb8386a79b75b 100644 (file)
--- 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 3a4fc21c8c7d76120839facc510eb50fe9dd0a93..ae951c89fdb39bc286647e3f8967e0a47c1e5f5d 100644 (file)
--- 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 f3d388f21e4e5025b4935b98a0cda0eb40449a04..b583588c3562ffe19c59b8ee62f8b2ee2a794721 100644 (file)
--- 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);
        }
 }