Changeset 329

Timestamp:

05/09/06 06:41:36 (3 years ago)

Author:

carmartin

Message:

profile: fixed profile and homepage breakage when not logged in

The changes in commit r325 "Fix to prevent 'edit profile' links from
erroneously appearing" caused breakage in the homepage and profile pages.

This is because the function uses $page_owner but it is not actually the
global $page_owner. Clobbering the global breaks all sorts of things, so
I've renamed the var.

The fix that seemed to be the most correct was to wrap that code within the
if (isloggedin()) block. Edit links are keeping to themselves when they should
so I think we are ok on that front.

Also reverted the switch to old style privilege checks, which I suspect
happened during debugging. profile_permission_check() is right there and
is literally the same code. It was not the source of the problem.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

Files:

• devel/mod/profile/lib.php (modified) (2 diffs)

devel/mod/profile/lib.php

@@ -6 +6 @@
-    global $PAGE;
-    global $CFG;
-    global $page_owner;
-
-
+
+
+
-
-    if (isloggedin()) {
-age_
+g
-            $PAGE->menu[] = array( 'name' => 'profile:me', 
-                                   'html' => '<li><a href="'.$CFG->wwwroot.$_SESSION['username'].'" class="selected">'.gettext("Your Profile").'</a></li>');
@@ -18 +19 @@
-                                   'html' => '<li><a href="'.$CFG->wwwroot.$_SESSION['username'].'">'.gettext("Your Profile").'</a></li>');
-        }
+
+        if (profile_permissions_check("profile") && context === "profile") {
+
+            $PAGE->menu_sub[] = array( 'name' => 'profile:edit', 
+                                       'html' => '<a href="'.$CFG->wwwroot.'profile/edit.php?profile_id='.$pgowner.'">'
+                                       . gettext("Edit this profile") . '</a>');
+
+            if (run("users:type:get", $pgowner) == "person") {
+                $PAGE->menu_sub[] = array( 'name' => 'profile:picedit', 
+                                           'html' => '<a href="'.$CFG->wwwroot.'_icons/?context=profile&profile_id='.$pgowner.'">'
+                                           . gettext("Change site picture") . '</a>');
+            }
+            $PAGE->menu_sub[] = array( 'name' => 'profile:help',
+                                       'html' => '<a href="'.$CFG->wwwroot.'help/profile_help.php">'
+                                       . gettext("Page help") . '</a>');
+        }
-    }
-
-    // if (profile_permissions_check("profile") && context === "profile") {
-    if (run("permissions:check", "profile") && context === "profile") {
-            
-        $PAGE->menu_sub[] = array( 'name' => 'profile:edit', 
-                                   'html' => '<a href="'.$CFG->wwwroot.'profile/edit.php?profile_id='.$page_owner.'">'
-                                   . gettext("Edit this profile") . '</a>');
-        
-        if (run("users:type:get", $page_owner) == "person") {
-            $PAGE->menu_sub[] = array( 'name' => 'profile:picedit', 
-                                       'html' => '<a href="'.$CFG->wwwroot.'_icons/?context=profile&profile_id='.$page_owner.'">'
-                                       . gettext("Change site picture") . '</a>');
-        }
-        $PAGE->menu_sub[] = array( 'name' => 'profile:help',
-                                   'html' => '<a href="'.$CFG->wwwroot.'help/profile_help.php">'
-                                   . gettext("Page help") . '</a>');
-        
-    }
-
-}
-