Changeset 13758

Timestamp:

05/30/2024 04:21:10 AM (23 months ago)

Author:

dd32

Message:

Theme Directory: Add additional checks to the themes api before marking a theme as 404.

This checks that there were no DB errors on the pageload, and that we don't have any cached update-check data.

This should reduce the chances of a query failure causing a theme to be marked as missing.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/themes/info/1.0/index.php (modified) (1 diff)
• wordpress.org/public_html/wp-content/plugins/theme-directory/themes-api.php (modified) (3 diffs)

sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php

@@ -147 +147 @@
 
 // Cache when a theme doesn't exist. See the validation handler above.
-if ( 'theme_information' == $action && isset( $slug ) && 404 == http_response_code() ) {
+if (
+    'theme_information' == $action &&
+    isset( $slug ) &&
+    404 == http_response_code() &&
+    // Validate that the theme doesn't exist for update-checks, as a sanity check.
+    ! wp_cache_get( $slug, 'theme-update-check' ) &&
+    // And that there were no DB errors.
+    empty( $wpdb->last_error )
+) {
     wp_cache_set( $slug, 'not_found', 'theme_information_error', WEEK_IN_SECONDS );
 }

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

@@ -3 +3 @@
  * Adjustments for the Themes API.
  */
+
+// Mark it as a global group whenever the theme directory is loaded.
+wp_cache_add_global_groups( 'theme-update-check' );
 
 /**
@@ -11 +14 @@
  */
 function wporg_themes_update_check( $post_id, $current_version ) {
-    $slug        = get_post( $post_id )->post_name;
-    $cache_group = 'theme-update-check';
-    wp_cache_add_global_groups( $cache_group );
+    $slug = get_post( $post_id )->post_name;
 
     $theme_meta = array(
@@ -21 +22 @@
     );
 
-    wp_cache_set( $slug, $theme_meta, $cache_group );
+    wp_cache_set( $slug, $theme_meta, 'theme-update-check' );
 
     // Delete the error cache if this theme is new.