Changes from trunk/wp-includes/ms-functions.php at r15186 to branches/3.0/wp-includes/ms-functions.php at r15452

File:

• branches/3.0/wp-includes/ms-functions.php (modified) (8 diffs)

branches/3.0/wp-includes/ms-functions.php

@@ -210 +210 @@
     $user = new WP_User($user_id);
 
-    if ( empty($user) || !$user->ID )
+    if ( empty( $user->ID ) )
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 
@@ -254 +254 @@
     // wp_revoke_user($user_id);
     $user = new WP_User($user_id);
+    if ( empty( $user->ID ) )
+        return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+
     $user->remove_all_caps();
 
@@ -373 +376 @@
 
 function is_blog_user( $blog_id = 0 ) {
-    global $current_user, $wpdb;
-
+    global $wpdb;
+ 
+    $current_user = wp_get_current_user();
     if ( !$blog_id )
         $blog_id = $wpdb->blogid;
@@ -653 +657 @@
     $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
     // TODO: Don't hard code activation link.
-    $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
+    $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1$s] Activate %2$s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
     wp_mail($user_email, $subject, $message, $message_headers);
     return true;
@@ -670 +674 @@
     $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "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" ) ), site_url( "wp-activate.php?key=$key" ), $key );
     // TODO: Don't hard code activation link.
-    $subject = sprintf( __( apply_filters( 'wpmu_signup_user_notification_subject', '[%1s] Activate %2s' ) ), $from_name, $user);
+    $subject = sprintf( __( apply_filters( 'wpmu_signup_user_notification_subject', '[%1$s] Activate %2$s' ) ), $from_name, $user);
     wp_mail($user_email, $subject, $message, $message_headers);
     return true;
@@ -1320 +1324 @@
 function is_user_spammy( $username = 0 ) {
     if ( $username == 0 ) {
-        global $current_user;
-        $user_id = $current_user->ID;
+        $user_id = get_current_user_id();
     } else {
         $user_id = get_user_id_from_string( $username );
@@ -1327 +1330 @@
     $u = new WP_User( $user_id );
 
-    if ( $u->spam == 1 )
-        return true;
-
-    return false;
+    return ( isset( $u->spam ) && $u->spam == 1 );
 }
 
@@ -1361 +1361 @@
 
 function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
-    global $current_user, $wpdb;
-
+    global $wpdb;
+
+    $current_user = wp_get_current_user();
     if ( $user_id == 0 )
         $user_id = $current_user->ID;