Ticket #15487: 15487-2.diff

wp-includes/query.php

@@ -2652 +2652 @@
                         return $this->queried_object;
 
                 $this->queried_object = NULL;
-                $this->queried_object_id = 0;
-
-                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
+                $this->queried_object_id = 0;   
+                
+                if ( ( $this->is_category || $this->is_tag || $this->is_tax ) && !$this->is_single ) {
                         $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
 
                         $query = reset( $tax_query_in );
@@ -2681 +2681 @@
                         $this->queried_object_id = (int) $this->get('author');
                         $this->queried_object = get_userdata( $this->queried_object_id );
                 }
-
+                
                 return $this->queried_object;
         }
 

wp-includes/canonical.php

@@ -66 +66 @@
         if ( !isset($redirect['query']) )
                 $redirect['query'] = '';
 
-        if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
+        if ( is_singular() && 1 >= $wp_query->post_count ) {
+        
+                $id = get_query_var('p');
+                $name = get_query_var('name');          
 
-                $vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+                if( $id )
+                        $vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+                elseif( $name )
+                        $vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE post_name = %s", $name) );
 
                 if ( isset($vars[0]) && $vars = $vars[0] ) {
                         if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )