Password expired change url: MDL-18719 If auth plugin doesn't provide a url, use...

Merged from MOODLE_18_STABLE

diff --git a/login/index.php b/login/index.php
index da4d18762056cfe17796f54a76c1f671679090aa..0184a375dde98ea71eca7c1ad09097ac7a737b0b 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -175,6 +175,9 @@
             if (!empty($userauth->config->expiration) and $userauth->config->expiration == 1) {
                 if ($userauth->can_change_password()) {
                     $passwordchangeurl = $userauth->change_password_url();
+                    if(!$passwordchangeurl) {
+                        $passwordchangeurl = $CFG->httpswwwroot.'/login/change_password.php';
+                    }
                 } else {
                     $passwordchangeurl = $CFG->httpswwwroot.'/login/change_password.php';
                 }