Ticket #13324: 13324.2.diff

wp-login.php

@@ -231 +231 @@
                 return new WP_Error('invalid_key', __('Invalid key'));
 
         // Generate something random for a password...
-        $new_pass = wp_generate_password();
+        $new_pass = wp_generate_password(12,false);
 
         do_action('password_reset', $user, $new_pass);
 
@@ -301 +301 @@
         if ( $errors->get_error_code() )
                 return $errors;
 
-        $user_pass = wp_generate_password();
+        $user_pass = wp_generate_password(12,false);
         $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
         if ( ! $user_id ) {
                 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );

wp-includes/ms-functions.php

@@ -727 +727 @@
         $user_login = $wpdb->escape($signup->user_login);
         $user_email = $wpdb->escape($signup->user_email);
         wpmu_validate_user_signup($user_login, $user_email);
-        $password = wp_generate_password();
+        $password = wp_generate_password(12,false);
 
         $user_id = username_exists($user_login);
 

wp-admin/ms-edit.php

@@ -173 +173 @@
                 $password = 'N/A';
                 $user_id = email_exists($email);
                 if ( !$user_id ) { // Create a new user with a random password
-                        $password = wp_generate_password();
+                        $password = wp_generate_password(12,false);
                         $user_id = wpmu_create_user( $domain, $password, $email );
                         if ( false == $user_id )
                                 wp_die( __( 'There was an error creating the user.' ) );
@@ -604 +604 @@
                 elseif ( empty($user['email']) )
                         wp_die( __( 'Missing email.' ) );
 
-                $password = wp_generate_password();
+                $password = wp_generate_password(12,false);
                 $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
                 if ( false == $user_id )

wp-admin/includes/upgrade.php

@@ -64 +64 @@
         $user_password = trim($user_password);
         $email_password = false;
         if ( !$user_id && empty($user_password) ) {
-                $user_password = wp_generate_password();
+                $user_password = wp_generate_password(12,false);
                 $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
                 $user_id = wp_create_user($user_name, $user_password, $user_email);
                 update_user_option($user_id, 'default_password_nag', true, true);

wp-admin/import/mt.php

@@ -103 +103 @@
         //function to check the authorname and do the mapping
         function checkauthor($author) {
                 //mtnames is an array with the names in the mt import file
-                $pass = wp_generate_password();
+                $pass = wp_generate_password(12,false);
                 if (!(in_array($author, $this->mtnames))) { //a new mt author name is found
                         ++ $this->j;
                         $this->mtnames[$this->j] = $author; //add that new mt author name to an array

wp-admin/import/wordpress.php

@@ -186 +186 @@
 
                                 $user_id = username_exists($new_author_name);
                                 if ( !$user_id ) {
-                                        $user_id = wp_create_user($new_author_name, wp_generate_password());
+                                        $user_id = wp_create_user($new_author_name, wp_generate_password(12,false));
                                 }
 
                                 if ( !is_wp_error( $user_id ) ) {