aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-09-24 18:10:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-09-24 18:10:10 +0000
commit9d81b5cddd3d6aca54f1a77e0711db2f6d413441 (patch)
tree3be222187561c962643871489fb11762df357477
parent46a37b59fd2f9b3e7b7b3a6829569c1caae3e077 (diff)
downloadelgg-9d81b5cddd3d6aca54f1a77e0711db2f6d413441.tar.gz
elgg-9d81b5cddd3d6aca54f1a77e0711db2f6d413441.tar.bz2
Merged [6905] to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6961 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/profile/start.php2
1 files changed, 1 insertions, 1 deletions
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");
}