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

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

Browse Source
This commit is contained in:
Huong Nguyen
2023-09-19 14:29:57 +08:00
committed by Jake Dallimore
parent 1b768a1f64 4e13a9e892
commit 267462f99c
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();