Merge branch 'MDL-60038-master' of https://github.com/aneno-m-e/moodle

This commit is contained in:
Sara Arjona 2023-01-02 16:35:16 +01:00
commit decf1ba332

View file

@ -2899,7 +2899,8 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
// Check that the user has agreed to a site policy if there is one - do not test in case of admins. // Check that the user has agreed to a site policy if there is one - do not test in case of admins.
// Do not test if the script explicitly asked for skipping the site policies check. // Do not test if the script explicitly asked for skipping the site policies check.
if (!$USER->policyagreed && !is_siteadmin() && !NO_SITEPOLICY_CHECK) { // Or if the user auth type is webservice.
if (!$USER->policyagreed && !is_siteadmin() && !NO_SITEPOLICY_CHECK && $USER->auth !== 'webservice') {
$manager = new \core_privacy\local\sitepolicy\manager(); $manager = new \core_privacy\local\sitepolicy\manager();
if ($policyurl = $manager->get_redirect_url(isguestuser())) { if ($policyurl = $manager->get_redirect_url(isguestuser())) {
if ($preventredirect) { if ($preventredirect) {