Fixes #3614 updated use of elgg_view_entity() throughout core

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 5b78f5db53dbff2abb3ce5168fcd106ab53001a0..6edc99dd41af7144b358028e2689d8ae2c20c6c4 100644 (file)
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -1628,7 +1628,7 @@ abstract class ElggEntity extends ElggData implements
                 */
 
                elgg_set_viewtype('default');
-               $view = elgg_view_entity($this, true);
+               $view = elgg_view_entity($this, array('full_view' => true));
                elgg_set_viewtype();
 
                $tmp[] = new ODDMetaData($uuid . "volatile/renderedentity/", $uuid,

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 8964d5b5328976e7f997b0f5a484e5ba68b83e25..6bdbc8b1fd347307920195539772d61179278216 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -38,7 +38,7 @@ function blog_get_page_content_read($guid = NULL) {
        }
 
        elgg_push_breadcrumb($blog->title);
-       $return['content'] = elgg_view_entity($blog, TRUE);
+       $return['content'] = elgg_view_entity($blog, array('full_view' => true));
        //check to see if comment are on
        if ($blog->comments_on != 'Off') {
                $return['content'] .= elgg_view_comments($blog);

diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index d0a9c630a3dbbfad535b3b44f279d831a9fb741e..8e097b09033afeae5ac97284d89e26353b74c748 100644 (file)
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -21,7 +21,7 @@ $title = $bookmark->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($bookmark, true);
+$content = elgg_view_entity($bookmark, array('full_view' => true));
 $content .= elgg_view_comments($bookmark);
 
 $body = elgg_view_layout('content', array(

diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 45e112d4d3c791989411cea81a63419813e261a8..4b395d20d30ae715193b56a503c5b1658be2f724 100644 (file)
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -22,7 +22,7 @@ $title = $file->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($file, true);
+$content = elgg_view_entity($file, array('full_view' => true));
 $content .= elgg_view_comments($file);
 
 $download = elgg_view('output/url', array(

diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 94d212ef62c03ab956bfd8844cef170342e8d1f3..342115c815a30ec0211fe7e63fed18a9358410bd 100644 (file)
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -167,7 +167,7 @@ function discussion_handle_view_page($guid) {
        elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
        elgg_push_breadcrumb($topic->title);
 
-       $content = elgg_view_entity($topic, true);
+       $content = elgg_view_entity($topic, array('full_view' => true));
        if ($topic->status == 'closed') {
                $content .= elgg_view('discussion/replies', array(
                        'entity' => $topic,

diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 69578278323f90d21d1a092e370dbe312fdda1ab..8bd51ab5c49e6d7fa25d985c360ee2cd1b09187b 100644 (file)
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -17,7 +17,7 @@ if ($featured_groups) {
        elgg_push_context('widgets');
        $body = '';
        foreach ($featured_groups as $group) {
-               $body .= elgg_view_entity($group, false);
+               $body .= elgg_view_entity($group, array('full_view' => false));
        }
        elgg_pop_context();
 

diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index 5397d33e5786b2d2ad0adcd5c4a0ae19ff94014e..9bedbd08af9464c5c91a50fbc827cb84ffba56b5 100644 (file)
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -27,7 +27,7 @@ if ($page_owner->getGUID() == $message->toId) {
 elgg_push_breadcrumb($title);
 
 $buttons = '';
-$content = elgg_view_entity($message, true);
+$content = elgg_view_entity($message, array('full_view' => true));
 if ($inbox) {
        $form_params = array(
                'id' => 'messages-reply-form',

diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index b73bc985cd93a5d7b54059d39867e31c83553ea2..06064d993b83efde849554b6a9a9e2d817301683 100644 (file)
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -29,7 +29,7 @@ if (elgg_instanceof($container, 'group')) {
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($page, true);
+$content = elgg_view_entity($page, array('full_view' => true));
 $content .= elgg_view_comments($page);
 
 $buttons = '';

diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index 2193a70d8b52925a4628b2591de99ced9caccb0a..e04d08836b7c764f628e4ae77fa89566f1c15e9a 100644 (file)
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -27,7 +27,7 @@ if (!$icon) {
        } else {
                // display a generic icon if no owner, though there will probably be
                // other problems if the owner can't be found.
-               $icon = elgg_view_entity($entity, 'tiny');
+               $icon = elgg_view_entity_icon($entity, 'tiny');
        }
 }
 

diff --git a/pages/entities/index.php b/pages/entities/index.php
index 13aea9e5a27302ebcb73453312deb447fea3ac49..d3b935dc43a013ab716958fb44f4f083af801b05 100644 (file)
--- a/pages/entities/index.php
+++ b/pages/entities/index.php
@@ -36,7 +36,7 @@ if ($entity = get_entity($guid)) {
        } else if ($entity instanceof ElggEntity) {
                $title = $entity->name;
        }
-       $area1 = elgg_view_entity($entity, true);
+       $area1 = elgg_view_entity($entity, array('full_view' => true));
        if ($shell) {
                $body = elgg_view_layout('one_column', array('content' => $area1));
        } else {

diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index c525a38aa7c6e6bca6af0b752608d8e036dc1d37..fc7f0f6d2f7d7f793486515fbf138a8792768fb5 100644 (file)
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -15,7 +15,7 @@ $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
        ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
-       $header = elgg_view_entity($owner, false);
+       $header = elgg_view_entity($owner, array('full_view' => false));
 
        $body = elgg_view_menu('owner_block', array('entity' => $owner));
 

diff --git a/views/json/entities/entity_list.php b/views/json/entities/entity_list.php
index b583588c3562ffe19c59b8ee62f8b2ee2a794721..d5b134a71e5d4cd7e36c76e725ac44e3c7f6d69d 100644 (file)
--- a/views/json/entities/entity_list.php
+++ b/views/json/entities/entity_list.php
@@ -4,7 +4,7 @@ $entities = $vars['entities'];
 $full_view = $vars['full_view'];
 
 if (is_array($entities) && sizeof($entities) > 0) {
-       foreach($entities as $entity) {
-               echo elgg_view_entity($entity, $full_view);
+       foreach ($entities as $entity) {
+               echo elgg_view_entity($entity, array('full_view' => $full_view));
        }
 }