Changeset 20522 for trunk/wp-includes/user.php

Timestamp:

04/18/2012 09:07:31 PM (14 years ago)

Author:

duck_

Message:

Pass full user objects to clean_user_cache(). See #19500, fixes #20460.

Prevents notices when clean_user_cache() is called for a user that has been removed from the database.

File:

• trunk/wp-includes/user.php (modified) (1 diff)

trunk/wp-includes/user.php

@@ -1144 +1144 @@
  * @since 3.0.0
  *
- * @param int $id User ID
- */
-function clean_user_cache($id) {
-    $user = WP_User::get_data_by( 'id', $id );
-
-    wp_cache_delete($id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
-    wp_cache_delete($user->user_email, 'useremail');
-    wp_cache_delete($user->user_nicename, 'userslugs');
+ * @param WP_User $user User object to be cleaned from the cache
+ */
+function clean_user_cache( $user ) {
+    if ( is_numeric( $user ) ) {
+        _deprecated_argument( __FUNCTION__, '3.4', 'Pass the full user object instead of the ID.' );
+        $user = new WP_User( $user );
+    }
+
+    if ( ! $user->exists() )
+        return;
+
+    wp_cache_delete( $user->ID, 'users' );
+    wp_cache_delete( $user->user_login, 'userlogins' );
+    wp_cache_delete( $user->user_email, 'useremail' );
+    wp_cache_delete( $user->user_nicename, 'userslugs' );
 }