From 30e6bb654da23d1c73312d86f9e14c1dc298e4c7 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 2 May 2012 20:31:37 +0000 Subject: [PATCH] Rolling upgrade to set the welcome_user_email network-wide option via the welcome_user_msg_filter() callback. Fixes ability to save the welcome user email when no entry exists in the database. see #20116 git-svn-id: http://core.svn.wordpress.org/trunk@20697 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index b939c92c92..f4fe306b7d 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1894,7 +1894,8 @@ add_filter('option_users_can_register', 'users_can_register_signup_filter'); */ function welcome_user_msg_filter( $text ) { if ( !$text ) { - return __( 'Dear User, + remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' ); + $text = __( 'Dear User, Your new account is set up. @@ -1906,6 +1907,7 @@ LOGINLINK Thanks! --The Team @ SITE_NAME' ); + update_site_option( 'welcome_user_email', $text ); } return $text; }