Back out bug 868330 for the 4.2 branch. This is not a security fix

diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 3bc16cbc085da10b3fbaa21de9445e3771349973..a2ae517c83dca39378b6196ab42ab340a90103c6 100644 (file)
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -20,20 +20,10 @@
 
 [% title = "Change Password" %]
 [% PROCESS global/header.html.tmpl %]
-[% password_complexity = Param('password_complexity') %]
+
 <p>
-  To change your password, enter a new password twice:<br>
+  To change your password, enter a new password twice:
 </p>
-<ul>
-  <li>Password must be at least [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long.</li>
-  [% IF password_complexity == "mixed_letters" %] 
-  <li>Password must contain at least one UPPER and one lowercase letter.</li>
-  [% ELSIF password_complexity == "letters_numbers" %] 
-  <li>Password must contain at least one UPPER and one lower case letter and a number.</li>
-  [% ELSIF password_complexity == "letters_numbers_specialchars" %] 
-  <li>Password must contain at least one letter, a number and a special character.</li>
-  [% END %]
-</ul>
 
 <form method="post" action="token.cgi">
   <input type="hidden" name="t" value="[% token FILTER html %]">
@@ -43,6 +33,7 @@
       <th align="right">New Password:</th>
       <td>
         <input type="password" name="password">
+        (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
       </td>
     </tr>
     

diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index c757d9140b4641f6813d12378d7a83c8bc1bd31d..2e11dffbce0be8a2e5ccaf56bbfb61564e5bca04 100644 (file)
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -136,6 +136,6 @@
     "<li>letters_numbers - Passwords must contain at least one UPPER and one " _
     "lower case letter and a number.</li>" _
     "<li>letters_numbers_specialchars - Passwords must contain at least one " _
-    "letter, a number and a special character.</li></ul>"
+    "UPPER or one lower case letter, a number and a special character.</li></ul>"
   }
 %]