Changeset 9870

Timestamp:

05/13/2020 06:00:48 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: Switch to using get_queried_object() instead of get_post() due to get_post not returning correctly on the theme directory sometimes.

Also moves the outdated theme noindexing to it's own filter.

See #5173.
Fixes #4994.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php (modified) (2 diffs)

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

@@ -1099 +1099 @@
     }
 
-    $post = get_post();
-    if ( ! $post ) {
+    $post = get_queried_object();
+    if ( ! $post || !( $post instanceof WP_Post ) ) {
         return;
     }
@@ -1121 +1121 @@
         echo "<meta name='twitter:image' content='" . esc_attr( $theme->screenshot_url . '?w=560&amp;strip=all' ) . "' />\n";
     }
-
-    // If it's outdated, noindex the theme.
-    if ( time() - strtotime( $theme->last_updated ) > 2 * YEAR_IN_SECONDS ) {
-        add_filter( 'wporg_noindex_request', '__return_true' );
-    }
 }
 add_action( 'wp_head', 'wporg_themes_add_meta_tags' );
+
+/**
+ * Noindex outdated themes.
+ */
+function wporg_themes_noindex_request( $noindex ) {
+    if ( is_single() && ( $post = get_queried_object() ) && $post instanceof WP_Post ) {
+        $theme = wporg_themes_theme_information( $post->post_name );
+        if ( $theme ) {
+            // If it's outdated, noindex the theme.
+            if ( time() - strtotime( $theme->last_updated ) > 2 * YEAR_IN_SECONDS ) {
+                $noindex = true;
+            }
+        }
+    }
+
+    return $noindex;
+}
+add_filter( 'wporg_noindex_request', 'wporg_themes_noindex_request' );
 
 /**