L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-79370 user: set profile page URL earlier, avoid subsequent error.

Browse Source 
Co-authored-by: Dominique Palumbo <[email protected]>
This commit is contained in:
Paul Holden
2023-09-18 09:25:22 +01:00
co-authored by Dominique Palumbo
parent ecddfa6ccd
commit 4e13a9e892
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/profile.php
+4 -6
View File
@@ -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();