merged change to allow admins to click on the force password change checkbox if using...

diff --git a/user/edit.html b/user/edit.html
index 4c7ca64d9227d77aded52841de4c8a67e61a0181..b03374f60a0b85936e809e84e5a05a1d146dabed 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -68,7 +68,7 @@ if (isadmin()) {
         }
         echo "</td>";
         echo "</tr>\n";
-        if (!$adminself && (!empty($CFG->{'auth_'.$user->auth.'_stdchangepassword'}) || $CFG->changepassword)){
+        if (!$adminself && (!empty($CFG->{'auth_'.$user->auth.'_stdchangepassword'}) || is_internal_auth())){
              if (get_user_preferences('auth_forcepasswordchange', NULL, $user->id)) {
                  $checked = ' checked="checked" ';
              } else {