Changeset 21845

Timestamp:

09/14/2012 05:19:25 PM (14 years ago)

Author:

nacin

Message:

In get_page_by_path(), attempt to return an item that has the same post type before returning an attachment with the same name. props SergeyBiryukov. tests in ​[UT1021]. fixes #15665.

File:

• trunk/wp-includes/post.php (modified) (2 diffs)

trunk/wp-includes/post.php

@@ -3307 +3307 @@
         $post_type_sql = $post_type;
         $wpdb->escape_by_ref( $post_type_sql );
-        $pages = $wpdb->get_results( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name IN ($in_string) AND (post_type = '$post_type_sql' OR post_type = 'attachment')", OBJECT_K );
+        $pages = $wpdb->get_results( "SELECT ID, post_name, post_parent, post_type FROM $wpdb->posts WHERE post_name IN ($in_string) AND (post_type = '$post_type_sql' OR post_type = 'attachment')", OBJECT_K );
 
         $revparts = array_reverse( $parts );
@@ -3326 +3326 @@
                         if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
                                 $foundid = $page->ID;
-                                break;
+                                if ( $page->post_type == $post_type )
+                                        break;
                         }
                 }