moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-01-20 19:23:05 +01:00
commit 298c45f2e3
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
auth/cas/auth.php
View file

@ -113,6 +113,12 @@ class auth_plugin_cas extends auth_plugin_ldap {
// If the multi-authentication setting is used, check for the param before connecting to CAS. // If the multi-authentication setting is used, check for the param before connecting to CAS.
if ($this->config->multiauth) { if ($this->config->multiauth) {
// If there is an authentication error, stay on the default authentication page.
if (!empty($SESSION->loginerrormsg)) {
return;
}
$authCAS = optional_param('authCAS', '', PARAM_RAW); $authCAS = optional_param('authCAS', '', PARAM_RAW);
if ($authCAS == 'NOCAS') { if ($authCAS == 'NOCAS') {
return; return;