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

Rewrite: alleviate conflicts between image attachment pages and posts when permalink structure is /%postname%/.

Browse Source 
Adds unit test.

Props SergeyBiryukov.
Fixes #24612.


git-svn-id: https://develop.svn.wordpress.org/trunk@35679 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-11-18 19:58:01 +00:00
parent 4aa34cf092
commit 56d7611f09
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-includes/query.php
View File

@ -1833,11 +1833,25 @@ class WP_Query {
} }
if ( '' != $qv['pagename'] ) { if ( '' != $qv['pagename'] ) {
$this->queried_object = get_page_by_path($qv['pagename']); $this->queried_object = get_page_by_path( $qv['pagename'] );
if ( !empty($this->queried_object) )
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;
$this->is_single = true;
}
}
}
if ( ! empty( $this->queried_object ) ) {
$this->queried_object_id = (int) $this->queried_object->ID; $this->queried_object_id = (int) $this->queried_object->ID;
else } 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') ) { 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; $this->is_page = false;

26
tests/phpunit/tests/query/conditionals.php
View File

@ -760,6 +760,32 @@ class Tests_Query_Conditionals extends WP_UnitTestCase {
$this->assertFalse( $q->is_single( $p2 ) ); $this->assertFalse( $q->is_single( $p2 ) );
} }
/**
* @ticket 24612
*/
public function test_is_single_with_slug_that_clashes_with_attachment() {
$this->set_permalink_structure( '/%postname%/' );
$attachment_id = $this->factory->post->create( array(
'post_type' => 'attachment',
) );
$post_id = $this->factory->post->create( array(
'post_title' => get_post( $attachment_id )->post_title
) );
$this->go_to( get_permalink( $post_id ) );
$q = $GLOBALS['wp_query'];
$this->assertTrue( $q->is_single() );
$this->assertTrue( $q->is_single( $post_id ) );
$this->assertFalse( $q->is_attachment() );
$this->assertFalse( $q->is_404() );
$this->set_permalink_structure();
}
function test_is_page() { function test_is_page() {
$post_id = self::factory()->post->create( array( 'post_type' => 'page' ) ); $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
$this->go_to( "/?page_id=$post_id" ); $this->go_to( "/?page_id=$post_id" );