Changeset 9535

Timestamp:

02/24/2020 11:44:33 PM (5 years ago)

Author:

dd32

Message:

Theme Directory: Redirect /themes/browse/featured to the homepage temporarily as we had incorrectly set it as the Canonical URL for the Theme directory.

See #5044.
Fixes #5048.

Location:

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

Files:

• plugins/theme-directory/theme-directory.php (modified) (2 diffs)
• themes/pub/wporg-themes/functions.php (modified) (2 diffs)

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

@@ -34 +34 @@
 include __DIR__ . '/jobs/class-trac-sync.php';
 new WordPressdotorg\Theme_Directory\Jobs\Manager();
+
+define( 'WPORG_THEMES_DEFAULT_BROWSE', 'popular' );
 
 /**
@@ -1285 +1287 @@
     $link = false;
 
-    if ( get_query_var( 'browse' ) ) {
+    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' ) . '/' );

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

@@ -76 +76 @@
         );
         wp_safe_redirect( $url, 301 );
+        die();
+    }
+
+    // Redirect /browse/featured/ to the front-page temporarily, as it's showing in Google results.
+    if ( '/themes/browse/featured' === substr( $path, 0, 23 ) ) {
+        wp_safe_redirect( home_url( '/' ), 302 );
         die();
     }
@@ -137 +143 @@
                     'nonce'  => is_user_logged_in() ? wp_create_nonce( 'modify-theme-favorite' ) : false,
                 ),
-                'browseDefault'=> 'popular',
+                'browseDefault'=> WPORG_THEMES_DEFAULT_BROWSE,
             ),
             'l10n' => array(