Changeset 9940

Timestamp:

05/29/2020 01:56:01 AM (4 years ago)

Author:

dd32

Message:

Developer: Remove the rel="canonical" implementation that can output incorrect links on some requests.
This will fall back to using the wporg-seo canonical implementation now instead.

See #5173.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/head.php

@@ -24 +24 @@
         add_filter( 'document_title_parts',     array( __CLASS__, 'document_title' ) );
         add_filter( 'document_title_separator', array( __CLASS__, 'document_title_separator' ) );
-        add_action( 'wp_head',                  array( __CLASS__, 'rel_canonical' ), 9 );
         add_action( 'wp_head',                  array( __CLASS__, 'output_head_tags' ), 2 );
     }
@@ -179 +178 @@
     }
 
-    /**
-     * Outputs `<link rel="canonical">` tags where appropriate.
-     */
-    public static function rel_canonical() {
-        $canonical = false;
-        $queried_object = get_queried_object();
-
-        if ( is_tax() || is_tag() || is_category() ) {
-            $canonical = get_term_link( $queried_object );
-        } elseif ( is_post_type_archive() ) {
-            $canonical = get_post_type_archive_link( $queried_object->name ); 
-        }
-
-        if ( $canonical && get_query_var( 'paged' ) > 1 ) {
-            $canonical .= 'page/' . (int) get_query_var( 'paged' ) . '/';
-        }
-
-        if ( $canonical ) {
-            printf( '<link rel="canonical" href="%s">' . "\n", esc_url( $canonical ) );
-        }
-    }
-
 } // DevHub_Head