WordPress.org

Make WordPress Core

Ticket #17529: 17259.diff

File 17259.diff, 1.1 KB (added by wpmuguru, 7 years ago)
  • wp-includes/ms-functions.php

     
    882882                        __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ),
    883883                        $user, $user_email, $key, $meta
    884884                ),
    885                 site_url( "wp-activate.php?key=$key" ),
    886                 $key
     885                site_url( "wp-activate.php?key=$key" )
    887886        );
    888887        // TODO: Don't hard code activation link.
    889888        $subject = sprintf(
     
    13401339        $message = $welcome_email;
    13411340
    13421341        if ( empty( $current_site->site_name ) )
    1343                 $current_site->site_name = 'WordPress MU';
     1342                $current_site->site_name = 'WordPress';
    13441343
    13451344        $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
    13461345        wp_mail($user->user_email, $subject, $message, $message_headers);
     
    20732072        update_site_option( 'user_count', $count );
    20742073}
    20752074
    2076 ?>
    2077  No newline at end of file
     2075?>