Changeset 7837

Timestamp:

04/25/2008 05:12:56 PM (17 years ago)

Author:

ryan

Message:

Add arg to make special chars optional when generating passwords. fixes #6842 for 2.5

Location:

branches/2.5

Files:

• wp-includes/pluggable.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

branches/2.5/wp-includes/pluggable.php ¶

@@ -1169 +1169 @@
  * @return string The random password
  **/
-function wp_generate_password($length = 12) {
-    $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()";
+function wp_generate_password($length = 12, $special_chars = true) {
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    if ( $special_chars )
+        $chars .= '!@#$%^&*()';
+
     $password = '';
     for ( $i = 0; $i < $length; $i++ )

branches/2.5/wp-login.php ¶

@@ -94 +94 @@
     if ( empty($key) ) {
         // Generate something random for a key...
-        $key = wp_generate_password();
+        $key = wp_generate_password(20, false);
         do_action('retrieve_password_key', $user_login, $key);
         // Now insert the new md5 key into the db