From 47941cb17af1c265a025d95109ffafe68fe08561 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 18 Sep 2023 09:23:40 +0100 Subject: [PATCH] MDL-79370 user: set profile page URL earlier, avoid subsequent error. Co-authored-by: Dominique Palumbo --- user/profile.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/user/profile.php b/user/profile.php index 553b24f56a7..f4823f98752 100644 --- a/user/profile.php +++ b/user/profile.php @@ -42,6 +42,10 @@ $userid = optional_param('id', 0, PARAM_INT); $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 @@ if (!empty($CFG->forceloginforprofiles)) { 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();