From aa8a3f89d8557da3a89a4f552e701188bb32bc7f Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 4 Jan 2012 19:29:03 +0000 Subject: [PATCH] Use home_url() instead of site_url(). Props johnbillion. fixes #18293 git-svn-id: http://svn.automattic.com/wordpress/trunk@19674 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/user-new.php | 2 +- wp-includes/ms-functions.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 87a0ec8038..c29dd740c1 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -26,7 +26,7 @@ If you do not want to join this site please ignore this email. This invitation will expire in a few days. Please click the following link to activate your user account: -%%s' ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) ); +%%s' ), get_bloginfo('name'), home_url(), esc_html( $_REQUEST[ 'role' ] ) ); } add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 09acdedf23..2466de9fc8 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1734,9 +1734,9 @@ function maybe_add_existing_user_to_blog() { 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 homepage.'), site_url() ) ); + wp_die( sprintf(__('An error occurred adding you to this site. Back to the homepage.'), home_url() ) ); - wp_die( sprintf(__('You have been added to this site. Please visit the homepage or log in using your username and password.'), site_url(), admin_url() ), __('Success') ); + wp_die( sprintf(__('You have been added to this site. Please visit the homepage or log in using your username and password.'), home_url(), admin_url() ), __('Success') ); } /**