Ticket #17661: fix-canonical-by-matched-query.diff

wp-includes/canonical.php

@@ -10 +10 @@
  */
 
 /**
+ * Determine if query var was the highest order matched rule in the query
+ * 
+ * @since 3.5.0
+ * 
+ * @global WP $wp
+ * @param string $var
+ * @return bool
+ */
+function is_matched_query( $var ) {
+        global $wp;
+        $queries = wp_parse_args( $wp->matched_query );
+        
+        return empty( $wp->matched_query ) || array_key_exists( $var, $queries );
+}
+
+/**
  * Redirects incoming links to the proper URL based on the site url.
  *
  * Search engines consider www.somedomain.com and somedomain.com to be two
@@ -38 +54 @@
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
         global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
-
+        
         if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) )
                 return;
 
@@ -148 +164 @@
                 } elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
                         if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
                                 $redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
-                } elseif ( is_year() && !empty($_GET['year']) ) {
+                } elseif ( is_matched_query( 'year' ) && is_year() && ! empty( $_GET['year'] ) ) {
                         if ( $redirect_url = get_year_link(get_query_var('year')) )
                                 $redirect['query'] = remove_query_arg('year', $redirect['query']);
-                } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
+                } elseif ( is_matched_query( 'author' ) && is_author() && ! empty( $_GET['author'] ) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
                         $author = get_userdata(get_query_var('author'));
                         if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
                                 if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )