Ticket #24612: 24612.patch

src/wp-includes/query.php

@@ -1666 +1666 @@
                 }
 
                 if ( '' != $qv['pagename'] ) {
-                        $this->queried_object = get_page_by_path($qv['pagename']);
-                        if ( !empty($this->queried_object) )
+                        $this->queried_object = get_page_by_path( $qv['pagename'] );
+
+                        if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {
+                                if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) {
+                                        // See if we also have a post with the same slug
+                                        $post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
+                                        if ( $post ) {
+                                                $this->queried_object = $post;
+                                                $this->is_page = false;
+                                        }
+                                }
+                        }
+
+                        if ( $this->queried_object )
                                 $this->queried_object_id = (int) $this->queried_object->ID;
                         else
-                                unset($this->queried_object);
+                                unset( $this->queried_object );
 
                         if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
                                 $this->is_page = false;