WordPress.org

Make WordPress Core

Ticket #20116: 20116.minimal.diff

File 20116.minimal.diff, 1.3 KB (added by duck_, 9 years ago)
  • wp-includes/ms-functions.php

     
    12161216                return false;
    12171217
    12181218        $welcome_email = stripslashes( get_site_option( 'welcome_email' ) );
    1219         if ( $welcome_email == false )
     1219        if ( false == $welcome_email )
    12201220                $welcome_email = stripslashes( __( 'Dear User,
    12211221
    12221222Your new SITE_NAME site has been successfully set up at:
     
    12791279        if ( !apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta) )
    12801280                return false;
    12811281
    1282         $welcome_email = get_site_option( 'welcome_user_email' );
     1282        $welcome_email = stripslashes( get_site_option( 'welcome_user_email' ) );
     1283        if ( false == $welcome_email )
     1284                $welcome_email = __( 'Dear User,
    12831285
     1286Your new account is set up.
     1287
     1288You can log in with the following information:
     1289Username: USERNAME
     1290Password: PASSWORD
     1291LOGINLINK
     1292
     1293Thanks!
     1294
     1295--The Team @ SITE_NAME' );
     1296
    12841297        $user = new WP_User($user_id);
    12851298
    12861299        $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
     
    19091922        }
    19101923        return $text;
    19111924}
    1912 add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
    19131925
    19141926/**
    19151927 * Whether to force SSL on content.