From 508fe03a44dec3a275c19fe2c63ab63fd04c0880 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 1 Nov 2011 21:08:22 -0400
Subject: Fixes #4035 made the entity view pages consistent for blog,
 bookmarks, file, pages, and forum posts

---
 mod/blog/lib/blog.php                               |  1 -
 mod/blog/views/default/object/blog.php              |  1 -
 mod/bookmarks/pages/bookmarks/view.php              |  1 -
 mod/bookmarks/views/default/object/bookmarks.php    |  1 -
 mod/file/views/default/object/file.php              |  1 -
 mod/groups/views/default/object/groupforumtopic.php |  1 -
 mod/pages/views/default/object/page_top.php         |  1 -
 views/default/object/elements/full.php              | 10 +---------
 8 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 792f32c42..590547a8c 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -20,7 +20,6 @@ function blog_get_page_content_read($guid = NULL) {
 
 	// no header or tabs for viewing an individual blog
 	$return['filter'] = '';
-	$return['header'] = '';
 
 	if (!elgg_instanceof($blog, 'object', 'blog')) {
 		$return['content'] = elgg_echo('blog:error:post_not_found');
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 05ddf62c7..3525b3d48 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -77,7 +77,6 @@ if ($full) {
 	$summary = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view('object/elements/full', array(
-		'title' => $blog->title,
 		'summary' => $summary,
 		'icon' => $owner_icon,
 		'body' => $body,
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 8e097b090..2439d2ee8 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -28,7 +28,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'header' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ba8029a54..89a0d03e0 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -79,7 +79,6 @@ HTML;
 
 	echo elgg_view('object/elements/full', array(
 		'entity' => $bookmark,
-		'title' => $bookmark->title,
 		'icon' => $owner_icon,
 		'summary' => $summary,
 		'body' => $body,
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 81421133f..1db9863c9 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -69,7 +69,6 @@ if ($full && !elgg_in_context('gallery')) {
 
 	$params = array(
 		'entity' => $file,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index f3d5f96d5..a579d89a4 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -64,7 +64,6 @@ if ($full) {
 
 	$params = array(
 		'entity' => $topic,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0a1c33458..e78289f28 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -80,7 +80,6 @@ if ($full) {
 
 	$params = array(
 		'entity' => $page,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
index 4a2991442..9b89f9706 100644
--- a/views/default/object/elements/full.php
+++ b/views/default/object/elements/full.php
@@ -2,8 +2,7 @@
 /**
  * Object full rendering
  *
- * Sample output
- * <h2>Title</h3>
+ * Sample output:
  * <div class="elgg-content">
  *     <div class="elgg-image-block">
  *     </div>
@@ -12,14 +11,12 @@
  * </div>
  *
  * @uses $vars['entity']   ElggEntity
- * @uses $vars['title']    Title (false for no title)
  * @uses $vars['icon']     HTML for the content icon
  * @uses $vars['summary']  HTML for the content summary
  * @uses $vars['body']     HTML for the content body
  * @uses $vars['class']    Optional additional class for the content wrapper
  */
 
-$title = elgg_extract('title', $vars);
 $icon = elgg_extract('icon', $vars);
 $summary = elgg_extract('summary', $vars);
 $body = elgg_extract('body', $vars);
@@ -30,14 +27,9 @@ if ($class) {
 	$class = "elgg-content";
 }
 
-if ($title) {
-	$title = elgg_view_title($title);
-}
-
 $header = elgg_view_image_block($icon, $summary);
 
 echo <<<HTML
-$title
 <div class="$class">
 $header
 $body
-- 
cgit v1.2.3