proper initialisation of passwordchangeurl; merged from MOODLE_16_STABLE

diff --git a/login/index.php b/login/index.php
index 50a091b4380fc616c05bab8e74cd0e604bc74a4f..6ba0ab2cf18df8e2164cb29c0b46dd1dcdda26be 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -144,11 +144,13 @@
                 $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
             } elseif($CFG->changepassword) {
                 $passwordchangeurl=$CFG->changepassword;
-            } 
+            } else {
+                $passwordchangeurl = '';
+            }
             
             // check whether the user should be changing password
             if (get_user_preferences('auth_forcepasswordchange', false) || $frm->password == 'changeme'){
-                if (isset($passwordchangeurl)) {
+                if ($passwordchangeurl != '') {
                     redirect($passwordchangeurl);
                 } else {
                     error("You cannot proceed without changing your password.