Changeset 54773 for branches/6.1

Timestamp:

11/09/2022 01:59:44 AM (2 years ago)

Author:

peterwilsoncc

Message:

Query: Don't attempt caching if running a WP_User_Query before plugins_loaded.

In #55594 user meta caching was enabled by default when making a WP_User_Query. Previously, this was only enabled if a developer specifically queried for 'all_with_meta'
fields. User meta caching is implemented using a pluggable function, cache_users. If a plugin runs a WP_User_Query before pluggable functions have been defined, this
will now cause a fatal error.

In this commit, a function_exists check is introduced to avoid calling cache_users if it's not defined. Additionally, a _doing_it_wrong notice is issued if the
WP_User_Query::query method is called before the 'plugins_loaded' hook.

Props carazo, subrataemfluence, oakesjosh, spacedmonkey, obenland, SergeyBiryukov, peterwilsoncc, TimothyBlynJacobs.
Merges [54766] to the 6.1 branch.
Fixes #56952.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-user-query.php (modified) (2 diffs)

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

@@ -777 +777 @@
         global $wpdb;
 
+        if ( ! did_action( 'plugins_loaded' ) ) {
+            _doing_it_wrong(
+                'WP_User_Query::query',
+                sprintf(
+                /* translators: %s: plugins_loaded */
+                    __( 'User queries should not be run before the %s hook.' ),
+                    '<code>plugins_loaded</code>'
+                ),
+                '6.1.1'
+            );
+        }
+
         $qv =& $this->query_vars;
 
@@ -841 +853 @@
             }
         } elseif ( 'all_with_meta' === $qv['fields'] || 'all' === $qv['fields'] ) {
-            cache_users( $this->results );
+            if ( function_exists( 'cache_users' ) ) {
+                cache_users( $this->results );
+            }
 
             $r = array();