merged, changepassword obsolete

diff --git a/auth/cas/login.php b/auth/cas/login.php
index 36cfd6977592e5b42e11c64ce2d805579ddb422c..36f74666d812695cf1ff84f9111afb3d6ac6c613 100644 (file)
--- a/auth/cas/login.php
+++ b/auth/cas/login.php
@@ -109,10 +109,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
             //Select password change url
             if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
                 $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-            } elseif($CFG->changepassword) {
-                $passwordchangeurl=$CFG->changepassword;
             } 
-            
 
             // check whether the user should be changing password
             if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -219,10 +216,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
         //Select password change url
         if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
             $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-        } elseif($CFG->changepassword) {
-            $passwordchangeurl=$CFG->changepassword;
-        } 
-        
+        }
 
         // check whether the user should be changing password
         if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -319,4 +313,4 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
     // No footer on this page
 
-?>
\ No newline at end of file
+?>