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

@@ -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;
 }