Changes from tags/3.1.3/wp-includes/ms-functions.php at r18288 to trunk/wp-includes/ms-functions.php at r18289

File:

• trunk/wp-includes/ms-functions.php (modified) (5 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.
@@ -1314 +1313 @@
 Username: USERNAME
 Password: PASSWORD
-Login Here: BLOG_URLwp-login.php
-
-We hope you enjoy your new site.
-Thanks!
+Log in here: BLOG_URLwp-login.php
+
+We hope you enjoy your new site. Thanks!
 
 --The Team @ SITE_NAME' ) );
@@ -1341 +1339 @@
 
     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 +1387 @@
 
     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) );
@@ -1861 +1859 @@
 function add_new_user_to_blog( $user_id, $email, $meta ) {
     global $current_site;
-    if ( $meta[ 'add_to_blog' ] ) {
+    if ( !empty( $meta[ 'add_to_blog' ] ) ) {
         $blog_id = $meta[ 'add_to_blog' ];
         $role = $meta[ 'new_role' ];