Fixes #3614 updated use of elgg_view_entity() throughout core

12 files changed, 13 insertions, 13 deletions

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 5b78f5db5..6edc99dd4 100644
--- 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 8964d5b53..6bdbc8b1f 100644
--- 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 d0a9c630a..8e097b090 100644
--- 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 45e112d4d..4b395d20d 100644
--- 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 94d212ef6..342115c81 100644
--- 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 695782783..8bd51ab5c 100644
--- 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 5397d33e5..9bedbd08a 100644
--- 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 b73bc985c..06064d993 100644
--- 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 2193a70d8..e04d08836 100644
--- 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 13aea9e5a..d3b935dc4 100644
--- 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 c525a38aa..fc7f0f6d2 100644
--- 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 b583588c3..d5b134a71 100644
--- 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));
 	}
 }