WordPress.org

Make WordPress Core

Ticket #22274: 22274.patch

File 22274.patch, 1.4 KB (added by pavelevap, 18 months ago)
  • wp-includes/ms-functions.php

     
    781781        $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    782782        $message = sprintf( 
    783783                apply_filters( 'wpmu_signup_user_notification_email', 
    784                         __( "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" ), 
     784                        __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ), 
    785785                        $user, $user_email, $key, $meta 
    786786                ), 
    787787                site_url( "wp-activate.php?key=$key" ) 
     
    11301130 
    11311131        $wpdb->suppress_errors(); 
    11321132        if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) 
    1133                 die( __( '<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>' ) . '</body></html>' ); 
     1133                die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' ); 
    11341134        $wpdb->suppress_errors( false ); 
    11351135 
    11361136        $url = get_blogaddress_by_id( $blog_id );