Merged [6905] to trunk.

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

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 4670fbbda2f1b85c5f2f1e513386bc5eb603a594..d6001b3fc829784fb2a3a9c385a46f5287507c86 100644 (file)
--- 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");
                }