Changeset 13759

Timestamp:

05/30/2024 04:48:38 AM (2 years ago)

Author:

dd32

Message:

Theme Directory: API: Remove a layer of caching, as these caches wrap other functions that have caching.

File:

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

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

@@ -223 +223 @@
          */
         public function hot_tags() {
-                $cache_key = sanitize_key( __METHOD__ );
-                if ( false === ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) ) {
-                        $tags = get_tags( array(
-                                'orderby'    => 'count',
-                                'order'      => 'DESC',
-                                'hide_empty' => false,
-                        ) );
-
-                        // Format in the API representation.
-                        foreach ( $tags as $tag ) {
-                                $this->response[ $tag->slug ] = array(
-                                        'name'  => $tag->name,
-                                        'slug'  => $tag->slug,
-                                        'count' => $tag->count,
-                                );
-                        }
-
-                        wp_cache_add( $cache_key, $this->response, $this->cache_group, $this->cache_life );
+                $tags = get_tags( array(
+                        'orderby'    => 'count',
+                        'order'      => 'DESC',
+                        'hide_empty' => false,
+                ) );
+
+                // Format in the API representation.
+                foreach ( $tags as $tag ) {
+                        $this->response[ $tag->slug ] = array(
+                                'name'  => $tag->name,
+                                'slug'  => $tag->slug,
+                                'count' => $tag->count,
+                        );
                 }
 
@@ -481 +476 @@
                 $this->fields = array_merge( $this->fields, $defaults, (array) $this->request->fields );
 
-                // If there is a cached result, return that.
-                $cache_key = sanitize_key( __METHOD__ . ':' . get_locale() . ':' . $this->request->slug . ':' . md5( serialize( $this->fields ) ) );
-                if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
-                        return;
-                }
-
                 if ( !empty( $post ) && 'repopackage' == $post->post_type && $this->request->slug === $post->post_name ) {
                         $this->response = $this->fill_theme( $post );
@@ -503 +492 @@
                         }
                 }
-
-                wp_cache_set( $cache_key, $this->response, $this->cache_group, $this->cache_life );
         }
 
@@ -551 +538 @@
                 $this->fields = array_merge( $this->fields, $defaults, $this->request->fields );
 
-                // If there is a cached result, return that.
-                $cache_key = sanitize_key( __METHOD__ . ':' . get_locale() . ':' . md5( serialize( $this->request ) . serialize( $this->fields ) ) );
-                if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
-                        return;
-                }
-
                 $this->result = $this->perform_wp_query();
 
@@ -576 +557 @@
                         $this->response->themes[] = $this->fill_theme( $theme );
                 }
-
-                wp_cache_set( $cache_key, $this->response, $this->cache_group, $this->cache_life );
         }
 
@@ -678 +657 @@
                         'post_type'      => 'theme_shop',
                         'posts_per_page' => -1,
+                        // NOTE: This rand() disables WP_Query caching.
                         'orderby'        => 'rand(' . gmdate('YmdH') . ')',
                 ) );
@@ -704 +684 @@
          */
         public function fill_theme( $theme ) {
-                // If there is a cached theme for the current locale, return that.
-                $cache_key = sanitize_key( implode( '-', array( $theme->post_name, md5( serialize( $this->fields ) ), get_locale() ) ) );
-                if ( false !== ( $phil = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
-                        return $phil;
-                }
-
                 global $wpdb;
 
@@ -944 +918 @@
                 }
 
-                wp_cache_set( $cache_key, $phil, $this->cache_group, $this->cache_life );
-
                 return $phil;
         }