Changeset 7898

Timestamp:

11/26/2018 04:51:14 AM (8 years ago)

Author:

dd32

Message:

WordPress.org: hreflang: Add a default x-default hreflang tag and use the canonical URL for singular pages when possible.

Fixes #3947, #3948.

Location:

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

Files:

• plugins/plugin-directory/class-template.php (modified) (3 diffs)
• plugins/theme-directory/theme-directory.php (modified) (4 diffs)
• themes/pub/wporg/functions.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -783 +783 @@
                         );
 
+                        // Add x-default to the list of sites.
+                        $sites['x-default'] = (object) array(
+                                'locale'    => 'x-default',
+                                'hreflang'  => 'x-default',
+                                'subdomain' => '',
+                        );
+
                         uasort( $sites, function( $a, $b ) {
                                 return strcasecmp( $a->hreflang, $b->hreflang );
@@ -788 +795 @@
 
                         wp_cache_set( 'local-sites-' . get_post()->post_name, $sites, 'locale-associations', DAY_IN_SECONDS );
+                }
+
+                if ( is_singular() ) {
+                        $path = parse_url( get_permalink(), PHP_URL_PATH );
+                        if ( get_query_var( 'plugin_advanced' ) ) {
+                                $path .= 'advanced/';
+                        }
+                } else {
+                        // WordPress doesn't have a good way to get the canonical version of non-singular urls.
+                        $path = $_SERVER['REQUEST_URI']; // phpcs:ignore
                 }
 
@@ -794 +811 @@
                                 'https://%swordpress.org%s',
                                 $site->subdomain ? "{$site->subdomain}." : '',
-                                $_SERVER['REQUEST_URI']
+                                $path
                         );
 

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

@@ -1090 +1090 @@
  */
 function wporg_themes_add_hreflang_link_attributes() {
+        if ( is_404() ) {
+                return;
+        }
+
         wp_cache_add_global_groups( array( 'locale-associations' ) );
 
@@ -1136 +1140 @@
                 );
 
+                // Add x-default to the list of sites.
+                $sites['x-default'] = (object) array(
+                        'locale'    => 'x-default',
+                        'hreflang'  => 'x-default',
+                        'subdomain' => '',
+                );
+
                 uasort( $sites, function( $a, $b ) {
                         return strcasecmp( $a->hreflang, $b->hreflang );
@@ -1141 +1152 @@
 
                 wp_cache_set( 'local-sites', $sites, 'locale-associations' );
+        }
+
+        if ( is_singular() ) {
+                $path = parse_url( get_permalink(), PHP_URL_PATH );
+        } else {
+                // WordPress doesn't have a good way to get the canonical version of non-singular urls.
+                $path = $_SERVER['REQUEST_URI']; // phpcs:ignore
         }
 
@@ -1147 +1165 @@
                         'https://%swordpress.org%s',
                         $site->subdomain ? "{$site->subdomain}." : '',
-                        $_SERVER[ 'REQUEST_URI' ]
+                        $path
                 );
 

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

@@ -191 +191 @@
  */
 function hreflang_link_attributes() {
+        // No hreflangs on 404 pages.
+        if ( is_404() ) {
+                return;
+        }
+
         wp_cache_add_global_groups( array( 'locale-associations' ) );
 
@@ -265 +270 @@
                 );
 
+                // Add x-default to the list of sites.
+                $sites['x-default'] = (object) array(
+                        'locale'    => 'x-default',
+                        'hreflang'  => 'x-default',
+                        'subdomain' => '',
+                );
+
                 uasort( $sites, function( $a, $b ) {
                         return strcasecmp( $a->hreflang, $b->hreflang );
@@ -270 +282 @@
 
                 wp_cache_set( 'local-sites', $sites, 'locale-associations' );
+        }
+
+        if ( is_singular() ) {
+                $path = parse_url( get_permalink(), PHP_URL_PATH );
+        } else {
+                // WordPress doesn't have a good way to get the canonical version of non-singular urls.
+                $path = $_SERVER['REQUEST_URI']; // phpcs:ignore
         }
 
@@ -276 +295 @@
                         'https://%swordpress.org%s',
                         $site->subdomain ? "{$site->subdomain}." : '',
-                        $_SERVER['REQUEST_URI'] // phpcs:ignore
+                        $path
                 );