Ticket #31224: 31224.2.diff

src/wp-includes/ms-functions.php

@@ -1918 +1918 @@
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-        if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+        if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
                 return false;
+        }
 
         $parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
         $key = array_pop( $parts );
 
-        if ( $key == '' )
+        if ( $key == '' ) {
                 $key = array_pop( $parts );
+        }
 
         $details = get_option( 'new_user_' . $key );
-        if ( !empty( $details ) )
+        if ( !empty( $details ) ) {
                 delete_option( 'new_user_' . $key );
+        }
 
-        if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-                wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+        if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+                wp_die( sprintf( __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ), home_url() ), array( 'response' => 200 ) );
+        }
 
-        wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ) );
+        wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
 
 /**