Ticket #20902: 20902.1.diff

wp-includes/canonical.php

@@ -155 +155 @@
                 } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
                         if ( $redirect_url = get_permalink(get_query_var('page_id')) )
                                 $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+                } elseif ( is_page() && ! empty( $_GET['pagename'] ) ) {
+                        $page = get_page_by_path( $_GET['pagename'] );
+                        if ( $page && $redirect_url = get_permalink( $page->ID ) )
+                                $redirect['query'] = remove_query_arg( 'pagename', $redirect['query'] );
                 } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front')  && ! $redirect_url ) {
                         $redirect_url = home_url('/');
                 } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
@@ -191 +195 @@
                                 if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
                                         $redirect['query'] = remove_query_arg('author', $redirect['query']);
                         }
+                } elseif ( is_author() && ! empty( $_GET['author_name'] ) ) {
+                        $author = get_user_by( 'slug', $_GET['author_name'] );
+                        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 ) )
+                                        $redirect['query'] = remove_query_arg( 'author_name', $redirect['query'] );
+                        }
                 } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
 
                         $term_count = 0;

wp-includes/post-formats.php

@@ -156 +156 @@
         $slugs = get_post_format_slugs();
         if ( isset( $slugs[ $qvs['post_format'] ] ) )
                 $qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
-        $tax = get_taxonomy( 'post_format' );
-        if ( ! is_admin() )
-                $qvs['post_type'] = $tax->object_type;
         return $qvs;
 }
 add_filter( 'request', '_post_format_request' );