Changeset 9526

Timestamp:

02/21/2020 02:08:17 AM (6 years ago)

Author:

dd32

Message:

Theme Directory: Don't use the global $wp_query object when querying themes.

This was causing cached results to be affected by other query params that WP_Query accepts through $_GET.

This will cause an increase in queries on same pages, but should be unnoticed thanks to the heavy caching we employ on these pages.

Debug left in to ignore caches with only 1 result, can be removed in a few hours after all caches expire.

Fixes #3215.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -426 +426 @@
      */
     public function query_themes() {
-        global $wp_query;
-
         // Set which fields wanted by default:
         $defaults = array(
@@ -451 +449 @@
         if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
 
+            // TODO: Remove this debug after Feb 21st 2020. See #3215.
             // DEBUG - Attempt to skip the cache when it only contains one theme when it should contain many.
             if (
@@ -463 +462 @@
                 return;
             }
-        }
-
-        if ( isset( $wp_query ) && $wp_query->query_vars ) {
-            $this->result = $wp_query;
-        } else {
-            $this->result = $this->perform_wp_query();
-        }
+
+        }
+
+        $this->result = $this->perform_wp_query();
 
         if ( empty( $this->request->fields ) ) {
@@ -492 +488 @@
             $this->response->themes[] = $this->fill_theme( $theme );
         }
-
-        /*
-        // DEBUG - Try to find out why the cache for the popular/featured views occasionally only include 1 theme.
-        if (
-            function_exists( 'slack_dm' ) &&
-            ( 1 === $this->response->info['results'] || 0 === $this->response->info['results'] ) &&
-            isset( $this->request->browse ) &&
-            'popular' === $this->request->browse
-        ) {
-            slack_dm( $_SERVER['REQUEST_URI'], 'dd32' );
-            slack_dm( print_r( $this->request, 1 ), 'dd32' );
-            slack_dm( print_r( $wp_query, 1 ), 'dd32' );
-        } */
 
         wp_cache_set( $cache_key, $this->response, $this->cache_group, $this->cache_life );