From 9d81b5cddd3d6aca54f1a77e0711db2f6d413441 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 24 Sep 2010 18:10:10 +0000
Subject: Merged [6905] to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6961 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 4670fbbda..d6001b3fc 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -179,7 +179,7 @@ function profile_pagesetup()
 	//add submenu options
 	if (get_context() == "profile") {
 		$page_owner = page_owner_entity();
-		if ($page_owner->canEdit()) {
+		if ($page_owner && $page_owner->canEdit()) {
 			add_submenu_item(elgg_echo('profile:editdetails'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/details");
 			add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/icon");
 		}
-- 
cgit v1.2.3