Changeset 15403

Timestamp:

07/13/2010 09:26:43 PM (15 years ago)

Author:

nacin

Message:

Fix checking for whether WP_User object is actually a user. props filosofo, fixes #13903 for 3.0.

Location:

branches/3.0

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (3 diffs)

branches/3.0/wp-admin/ms-edit.php

@@ -266 +266 @@
             foreach ( (array) $newroles as $userid => $role ) {
                 $user = new WP_User( $userid );
-                if ( ! $user )
+                if ( empty( $user->ID ) )
                     continue;
                 $user->for_blog( $id );

branches/3.0/wp-includes/capabilities.php

@@ -1113 +1113 @@
     $author = new WP_User( $post->post_author );
 
-    if ( empty( $author ) )
+    if ( empty( $author->ID ) )
         return false;
 

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();
 
@@ -1327 +1330 @@
     $u = new WP_User( $user_id );
 
-    if ( $u->spam == 1 )
-        return true;
-
-    return false;
+    return ( isset( $u->spam ) && $u->spam == 1 );
 }