From 1f3ca85ab58efb0a5287e7ecc5062b3183ac58f6 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
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: https://develop.svn.wordpress.org/trunk@20697 602fd350-edb4-49c9-b593-d223f7449a82
---
 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;
 }