Changeset 20543

Timestamp:

04/19/2012 11:00:36 PM (13 years ago)

Author:

nacin

Message:

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 for the 3.3 branch.

File:

• branches/3.3/wp-includes/ms-functions.php (modified) (2 diffs)

branches/3.3/wp-includes/ms-functions.php

@@ -1897 +1897 @@
 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.
@@ -1909 +1910 @@
 
 --The Team @ SITE_NAME' );
+        update_site_option( 'welcome_user_email', $text );
     }
     return $text;