Merge branch 'MDL-79370-402' of https://github.com/paulholden/moodle …

…into MOODLE_402_STABLE

user/profile.php

@@ -42,6 +42,10 @@
 $edit           = optional_param('edit', null, PARAM_BOOL);    // Turn editing on and off.
 $reset          = optional_param('reset', null, PARAM_BOOL);
 
+// Even if the user didn't supply a userid, we treat page URL as if they did; this is needed so navigation works correctly.
+$userid = $userid ?: $USER->id;
+$PAGE->set_url('/user/profile.php', ['id' => $userid]);
+
 if (!empty($CFG->forceloginforprofiles)) {
     require_login();
     if (isguestuser()) {
@@ -57,12 +61,6 @@
     require_login();
 }
 
-$userid = $userid ? $userid : $USER->id;       // Owner of the page.
-
-// Even if the user didn't supply a userid, we treat page URL as if they did; this is needed
-// so navigation works correctly.
-$PAGE->set_url('/user/profile.php', ['id' => $userid]);
-
 if ((!$user = $DB->get_record('user', array('id' => $userid))) || ($user->deleted)) {
     $PAGE->set_context(context_system::instance());
     echo $OUTPUT->header();