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

Merge branch 'MDL-85546-500' of https://github.com/raortegar/moodle into MOODLE_500_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-10-01 08:21:52 +07:00
parent c3bdb06c9e b23112b7c4
commit 0bcb02697a
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/mfa/classes/manager.php
+16 -22
View File
@@ -50,7 +50,7 @@ class manager {
],
'tool_mfa' => [
'guidance',
]
],
];
/**
@@ -441,6 +441,21 @@ class manager {
$url = new \moodle_url($url);
}
// Admin not setup.
if (!empty($CFG->adminsetuppending)) {
return self::NO_REDIRECT;
}
// Honor prevent_redirect.
if ($preventredirect) {
return self::NO_REDIRECT;
}
// Login as.
if (\core\session\manager::is_loggedinas()) {
return self::NO_REDIRECT;
}
// Check for pluginfile.php urls.
$pluginfileurl = new \moodle_url('/pluginfile.php');
if ($url->compare($pluginfileurl)) {
@@ -485,22 +500,6 @@ class manager {
}
}
// Admin not setup.
if (!empty($CFG->adminsetuppending)) {
return self::NO_REDIRECT;
}
// Initial installation.
// We get this for free from get_plugins_with_function.
// Upgrade check.
// We get this for free from get_plugins_with_function.
// Honor prevent_redirect.
if ($preventredirect) {
return self::NO_REDIRECT;
}
// User not properly setup.
if (user_not_fully_set_up($USER)) {
return self::NO_REDIRECT;
@@ -516,11 +515,6 @@ class manager {
return self::NO_REDIRECT;
}
// Login as.
if (\core\session\manager::is_loggedinas()) {
return self::NO_REDIRECT;
}
// Site policy.
if (isset($USER->policyagreed) && !$USER->policyagreed) {
$manager = new \core_privacy\local\sitepolicy\manager();