mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-69888-user-fully-setup-cache' of https://github.com/brendanheywood/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-09-14 11:33:47 +08:00
commit a4fb12a1a3
1 changed files with 13 additions and 1 deletions

14
lib/moodlelib.php

@ -3438,9 +3438,18 @@ function update_user_login_times() {
* @return bool
*/
function user_not_fully_set_up($user, $strict = true) {
global $CFG;
global $CFG, $SESSION, $USER;
require_once($CFG->dirroot.'/user/profile/lib.php');
// If the user is setup then store this in the session to avoid re-checking.
// Some edge cases are when the users email starts to bounce or the
// configuration for custom fields has changed while they are logged in so
// we re-check this fully every hour for the rare cases it has changed.
if (isset($USER->id) && isset($user->id) && $USER->id === $user->id &&
isset($SESSION->fullysetupstrict) && (time() - $SESSION->fullysetupstrict) < HOURSECS) {
return false;
}
if (isguestuser($user)) {
return false;
}
@ -3457,6 +3466,9 @@ function user_not_fully_set_up($user, $strict = true) {
if (!profile_has_required_custom_fields_set($user->id)) {
return true;
}
if (isset($USER->id) && isset($user->id) && $USER->id === $user->id) {
$SESSION->fullysetupstrict = time();
}
}
return false;