Merged r6757:6810 from 1.7 branch into trunk

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

1 files changed, 7 insertions, 26 deletions

diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index c89371013..a340e7a09 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -5,37 +5,18 @@
  */
 
 $page_owner = page_owner();
-$page_owner_user = get_entity($page_owner);
+$page_owner_entity = get_entity($page_owner);
 
-$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+$display = "<h2>" . $vars['title'] . "</h2>";
+
+$submenu = get_submenu();
 if (!empty($submenu)) {
 	$submenu = "<ul class='submenu extended'>" . $submenu . "</ul>";
 }
 
-if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) {
-	$info = "<h2>" . $vars['title'] . "</h2>";
-	if($page_owner_user instanceOf ElggGroup) {
-		$display = $info;
-	} else {
-		$display = $info;
-	}
-	if (!empty($submenu) && $vars['submenu'] == true) {
-		// plugins can extend this to add menu options
-		$display .= $submenu;
-	}
-} else {
-	$info = "<h2>" . $vars['title'] . "</h2>";
-	if($page_owner_user instanceOf ElggGroup) {
-		$display = $info;
-	} else {
-		$display = $info;
-	}
-	if (!empty($submenu)  && $vars['submenu'] == true) {
-		// plugins can extend this to add menu options
-		$display .= $submenu;
-	}
+if (!empty($submenu)  && $vars['submenu'] == true) {
+	// plugins can extend this to add menu options
+	$display .= $submenu;
 }
 
-
-//print to screen
 echo $display;
\ No newline at end of file