Changeset 20697

Timestamp:

05/02/2012 08:31:37 PM (12 years ago)

Author:

ryan

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

Location:

trunk

Files:

• . (modified) (1 prop)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-includes/ms-functions.php

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