WordPress.org

Make WordPress Core

Ticket #18293: 18293.patch

File 18293.patch, 2.4 KB (added by johnbillion, 7 years ago)
  • wp-admin/user-new.php

     
    2626this email. This invitation will expire in a few days.
    2727
    2828Please click the following link to activate your user account:
    29 %%s' ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
     29%%s' ), get_bloginfo('name'), home_url(), esc_html( $_REQUEST[ 'role' ] ) );
    3030        }
    3131        add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
    3232
     
    7373                        $newuser_key = substr( md5( $user_id ), 0, 5 );
    7474                        add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
    7575                        $message = __("Hi,\n\nYou have been invited to join '%s' at\n%s with the role of %s.\nPlease click the following link to confirm the invite:\n%s\n");
    76                         wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ),  sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
     76                        wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ),  sprintf($message, get_option('blogname'), home_url(), $_REQUEST[ 'role' ], home_url("/newbloguser/$newuser_key/")));
    7777                        $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
    7878                }
    7979        }
  • wp-includes/ms-functions.php

     
    18261826                delete_option( 'new_user_' . $key );
    18271827
    18281828        if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
    1829                 wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), site_url() ) );
     1829                wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
    18301830
    1831         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.'), site_url(), admin_url() ), __('Success') );
     1831        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() ), __('Success') );
    18321832}
    18331833
    18341834/**