Changeset 18003

Timestamp:

05/23/11 05:43:07 (3 years ago)

Author:

nacin

Message:

s/WordPress MU/WordPress/ and remove an unused sprintf param. props wpmuguru, fixes #17529.

File:

• trunk/wp-includes/ms-functions.php (modified) (3 diffs)

trunk/wp-includes/ms-functions.php

@@ -883 +883 @@
             $user, $user_email, $key, $meta
         ),
-        site_url( "wp-activate.php?key=$key" ),
-        $key
+        site_url( "wp-activate.php?key=$key" )
     );
     // TODO: Don't hard code activation link.
@@ -1341 +1340 @@
 
     if ( empty( $current_site->site_name ) )
-        $current_site->site_name = 'WordPress MU';
+        $current_site->site_name = 'WordPress';
 
     $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
@@ -1389 +1388 @@
 
     if ( empty( $current_site->site_name ) )
-        $current_site->site_name = 'WordPress MU';
+        $current_site->site_name = 'WordPress';
 
     $subject = apply_filters( 'update_welcome_user_subject', sprintf(__('New %1$s User: %2$s'), $current_site->site_name, $user->user_login) );