Merge branch 'MDL-48873_moodle28' of https://github.com/StudiUM/moodle into MOODLE_28_STABLE

2015-01-20 19:27:22 +01:00
parent 189dee55d4 6dc66f5a48
commit c41fe79c85
1 changed files with 6 additions and 0 deletions
@@ -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 ($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);
            if ($authCAS == 'NOCAS') {
                return;