Ticket #42389: 42389.patch

src/wp-activate.php

@@ -131 +131 @@
 
                         <div id="signup-welcome">
                                 <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-                                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
+                                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo empty( $result['user_exists'] ) ? $result['password'] : __( 'Use existing password.' ); ?></p>
                         </div>
 
                         <?php if ( $url && $url != network_home_url( '', 'http' ) ) :

src/wp-includes/ms-functions.php

@@ -1056 +1056 @@
 
         $meta = maybe_unserialize($signup->meta);
         $password = wp_generate_password( 12, false );
+        $user_already_exists = false;
 
         $user_id = username_exists($signup->user_login);
 
@@ -1107 +1108 @@
          *
          * @since MU (3.0.0)
          *
-         * @param int    $blog_id       Blog ID.
-         * @param int    $user_id       User ID.
-         * @param int    $password      User password.
-         * @param string $signup_title  Site title.
-         * @param array  $meta          Signup meta data. By default, contains the requested privacy setting and lang_id.
+         * @param int    $blog_id             Blog ID.
+         * @param int    $user_id             User ID.
+         * @param int    $password            User password.
+         * @param string $signup_title        Site title.
+         * @param array  $meta                Signup meta data. By default, contains the requested privacy setting and lang_id.
+         * @param bool   $user_already_exists Is user already exist or did we create new user?
          */
-        do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
+        do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta, $user_already_exists );
 
-        return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
+        return array( 'blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta, 'user_exists' => $user_already_exists );
 }
 
 /**