Changeset 34919

Timestamp:

10/07/2015 10:41:07 PM (9 years ago)

Author:

boonebgorges

Message:

Handle WP_User objects properly in update_user_caches().

We should not be storing the WP_User object in the cache, as it may contain
usermeta and other data that's cache elsewhere.

Props dd32.
See #24635.

Location:

trunk

Files:

• src/wp-includes/user-functions.php (modified) (1 diff)
• tests/phpunit/tests/user/updateUserCaches.php (modified) (1 diff)

trunk/src/wp-includes/user-functions.php

@@ -1103 +1103 @@
  * @since 3.0.0
  *
- * @param object $user User object to be cached
- */
-function update_user_caches($user) {
+ * @param object|WP_User $user User object to be cached
+ * @return bool|null Returns false on failure.
+ */
+function update_user_caches( $user ) {
+    if ( $user instanceof WP_User ) {
+        if ( ! $user->exists() ) {
+            return false;
+        }
+
+        $user = $user->data;
+    }
+
     wp_cache_add($user->ID, $user, 'users');
     wp_cache_add($user->user_login, $user->ID, 'userlogins');

trunk/tests/phpunit/tests/user/updateUserCaches.php

@@ -51 +51 @@
         $this->assertEquals( 12345, wp_cache_get( 'bar', 'userslugs' ) );
     }
+
+    /**
+     * @ticket 24635
+     */
+    public function test_should_store_raw_data_in_users_bucket_when_passed_a_wp_user_object() {
+        global $wpdb;
+
+        $u = $this->factory->user->create();
+        $raw_userdata = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $u ) );
+        $user_object = new WP_User( $u );
+
+        update_user_caches( $user_object );
+
+        $cached = wp_cache_get( $u, 'users' );
+        $this->assertFalse( $cached instanceof WP_User );
+        $this->assertEquals( $raw_userdata, $cached );
+    }
 }