Ticket #17661: 17661.diff

wp-includes/canonical.php

@@ -148 +148 @@
                 } 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_var( '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_var( '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) )

wp-includes/class-wp.php

@@ -106 +106 @@
         function set_query_var($key, $value) {
                 $this->query_vars[$key] = $value;
         }
-
+        /**
+     * Determine if the query var matches a proper property in WP's $matched_query
+         *
+         * @since 3.7.0
+         *
+         * @param string $key Name of the query var to check
+         * @return bool Whether the query var is in the matched rewrite (pretty permalinks) or
+         *   query string
+         */
+        function is_matched_query_var( $key ) {
+                $queries = wp_parse_args( $this->matched_query );
+                return ( empty( $this->matched_query ) && ! empty( $_GET[$key] ) ) || array_key_exists( $key, $queries );
+        }
         /**
          * Parse request to find correct WordPress query.
          *

wp-includes/functions.php

@@ -783 +783 @@
 }
 
 /**
+ * Determine if the query var matches a proper property in WP's $matched_query
+ *
+ * @since 3.7.0
+ *
+ * @global WP $wp The main WP instance
+ * @param string $key Name of the query var to check
+ * @return bool Whether the query var is in the matched rewrite (pretty permalinks) or
+ *   query string
+ */
+function is_matched_query_var( $key ) {
+        global $wp;
+        return $wp->is_matched_query_var( $key );
+}
+
+/**
  * Retrieve the description for the HTTP status.
  *
  * @since 2.3.0