Changeset 9864

Timestamp:

05/13/2020 05:04:11 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: Remove specific SEO fixes that are included in the generic SEO fixes plugin.

See #5173.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/theme-directory/theme-directory.php (modified) (3 diffs)
• themes/pub/wporg-themes/functions.php (modified) (2 diffs)
• themes/pub/wporg-themes/page-upload.php (modified) (1 diff)

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

@@ -1124 +1124 @@
     // If it's outdated, noindex the theme.
     if ( time() - strtotime( $theme->last_updated ) > 2 * YEAR_IN_SECONDS ) {
-        echo "<meta name='robots' content='noindex,follow' />\n";
+        add_filter( 'wporg_noindex_request', '__return_true' );
     }
 }
@@ -1274 +1274 @@
 
 /**
- * Outputs X-Robots-Tag with noindex for feeds.
- */
-function wporg_themes_noindex_for_feeds() {
-    if ( is_tag() ) {
-        header( 'X-Robots-Tag: noindex' );
-    }
-    if ( is_search() ) {
-        header( 'X-Robots-Tag: noindex, follow' );
-    }
-}
-add_action( 'themes_custom_feed_head', 'wporg_themes_noindex_for_feeds' );
-
-/**
- * Outputs a <link rel="canonical"> on archive pages.
- */
-function wporg_themes_archive_rel_canonical_link() {
-    if ( $url = wporg_themes_get_current_url() ) {
-        printf(
-            '<link rel="canonical" href="%s">' . "\n",
-            esc_url( $url )
-        );
-    }
-}
-add_action( 'wp_head', 'wporg_themes_archive_rel_canonical_link' );
-remove_action( 'wp_head', 'rel_canonical' );
-
-/**
  * Get the current front-end requested URL.
  */
 function wporg_themes_get_current_url( $path_only = false ) {
-    $queried_object = get_queried_object();
-    $link = false;
-
-    if ( get_query_var( 'browse' ) && WPORG_THEMES_DEFAULT_BROWSE === get_query_var( 'browse' ) ) {
-        $link = home_url( '/' );
-    } elseif ( get_query_var( 'browse' ) ) {
-        // The browse/% urls on the Theme directory are front-page-query alterations.
-        $link = home_url( 'browse/' . get_query_var( 'browse' ) . '/' );
-    } elseif ( is_author() ) {
-        // On WordPress.org get_author_posts_url() returns profile.wordpress.org links. Build it manually.
-        $link = home_url( 'author/' . $queried_object->user_nicename . '/' );
-    } elseif ( is_tax() || is_tag() || is_category() ) {
-        $link = get_term_link( $queried_object );
-    } elseif ( is_singular() ) {
-        $link = get_permalink( $queried_object );
-    } elseif ( is_search() ) {
-        $link = home_url( 'search/' . urlencode( get_query_var( 's' ) ) . '/' );
-    } elseif ( is_front_page() ) {
-        $link = home_url( '/' );
-    }
-
-
-    if ( $link && is_paged() ) {
-        if ( false !== stripos( $link, '?' ) ) {
-            $link = add_query_arg( 'paged', (int) get_query_var( 'paged' ), $link );
-        } else {
-            $link = rtrim( $link, '/' ) . '/page/' . (int) get_query_var( 'paged' ) . '/';
-        }
-    }
+    // Back-compat: TODO: Used by hreflang links.
+    $link = \WordPressdotorg\SEO\Canonical\get_canonical_url();
 
     if ( $path_only && $link ) {
@@ -1345 +1291 @@
     return $link;
 }
+
+/**
+ * Filter the WordPress.org SEO plugin Canonical location to respect Theme Directory differences.
+ */
+function wporg_canonical_url( $url ) {
+    if ( get_query_var( 'browse' ) && WPORG_THEMES_DEFAULT_BROWSE === get_query_var( 'browse' ) ) {
+        $url = home_url( '/' );
+    } elseif ( get_query_var( 'browse' ) ) {
+        // The browse/% urls on the Theme directory are front-page-query alterations.
+        $url = home_url( 'browse/' . get_query_var( 'browse' ) . '/' );
+    }
+
+    return $url;
+}
+add_filter( 'wporg_canonical_url', 'wporg_canonical_url' );
+
+// Theme Directory doesn't support pagination.
+add_filter( 'wporg_rel_next_pages', '__return_zero' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

@@ -286 +286 @@
 
 /**
- * Outputs `noindex,follow` robots tag for search results and author archives.
- */
-function wporg_themes_noindex() {
-    if ( is_search() || is_author() ) {
-        wp_no_robots();
-    }
-}
-add_action( 'wp_head', 'wporg_themes_noindex' );
-
-/**
  * Overrides feeds to use a custom RSS2 feed which contains the current requests themes.
  */
@@ -309 +299 @@
     die();
 }
-add_filter( 'template_redirect', 'wporg_themes_custom_feed' );
+add_filter( 'template_redirect', 'wporg_themes_custom_feed', 9999 );
 
 /**

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-upload.php

@@ -9 +9 @@
 
 // Search engines don't need to index the upload form. Should help prevent users uploading themes they didn't create.
-if ( ! function_exists( 'wporg_meta_robots' ) ) {
-    function wporg_meta_robots() {
-        return 'noindex';
-    }
-}
+add_filter( 'wporg_noindex_request', '__return_true' );
 
 // Use the translated post title.