sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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. 

git-svn-id: https://develop.svn.wordpress.org/trunk@21845 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2012-09-14 17:19:25 +00:00
parent 6d2fc0af91
commit 5b132e4c24
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/post.php
View File

@ -3306,7 +3306,7 @@ function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
$in_string = "'". implode( "','", $parts ) . "'"; $in_string = "'". implode( "','", $parts ) . "'";
$post_type_sql = $post_type; $post_type_sql = $post_type;
$wpdb->escape_by_ref( $post_type_sql ); $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 ); $revparts = array_reverse( $parts );
@ -3325,7 +3325,8 @@ function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) { if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
$foundid = $page->ID; $foundid = $page->ID;
break; if ( $page->post_type == $post_type )
break;
} }
} }
} }