Ticket #40613: 40613.patch

src/wp-includes/class-wp-user-query.php

@@ -596 +596 @@
 
                 $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-                if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-                        $this->results = $wpdb->get_results( $this->request );
-                } else {
-                        $this->results = $wpdb->get_col( $this->request );
-                }
+                // Get
+                $cache_key    = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->fill_query_vars( array() ) ) ) ) );
+                $last_changed = wp_cache_get_last_changed( 'users' );
+                $cache_key    = "get_users:{$cache_key}:{$last_changed}";
+                $cache_value  = wp_cache_get( $cache_key, 'users' );
 
-                /**
-                 * Filters SELECT FOUND_ROWS() query for the current WP_User_Query instance.
-                 *
-                 * @since 3.2.0
-                 *
-                 * @global wpdb $wpdb WordPress database abstraction object.
-                 *
-                 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
-                 */
-                if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-                        $this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+                if ( false === $cache_value ) {
+                        if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
+                                $this->results = $wpdb->get_results( $this->request );
+                        } else {
+                                $this->results = $wpdb->get_col( $this->request );
+                        }
+
+                        /**
+                         * Filters SELECT FOUND_ROWS() query for the current WP_User_Query instance.
+                         *
+                         * @since 3.2.0
+                         *
+                         * @global wpdb $wpdb WordPress database abstraction object.
+                         *
+                         * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
+                         */
+                        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+                                $this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+                        }
+
+                        // Setup array to cache
+                        $cache_value = array(
+                                'users'       => $this->results,
+                                'found_users' => (int) $this->total_users,
+                        );
+
+                        // Add results to cache to cache
+                        wp_cache_add( $cache_key, $cache_value, 'users' );
+                } else {
+                        $this->results     = $cache_value['users'];
+                        $this->total_users = (int) $cache_value['found_users'];
+                }
 
                 if ( !$this->results )
                         return;

src/wp-includes/user.php

@@ -1290 +1290 @@
         wp_cache_delete( $user->user_login, 'userlogins' );
         wp_cache_delete( $user->user_email, 'useremail' );
         wp_cache_delete( $user->user_nicename, 'userslugs' );
+        wp_cache_delete( 'last_changed', 'users' );
 
         /**
          * Fires immediately after the given user's cache is cleaned.
@@ -1693 +1694 @@
         } elseif ( ! $update ) {
                 $user->set_role(get_option('default_role'));
         }
-        wp_cache_delete( $user_id, 'users' );
-        wp_cache_delete( $user_login, 'userlogins' );
+
+        clean_user_cache( $user );
 
         if ( $update ) {
                 /**