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

Fix an error in SQL generation when `perm` is set and an array is passed for `post_status`. Adds unit test. 

Props oso96_2000.
Fixes #25523.



git-svn-id: https://develop.svn.wordpress.org/trunk@27067 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-02-02 07:35:54 +00:00
parent d1cc542e1f
commit b8e7bbb0f2
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2756,8 +2756,10 @@ class WP_Query {
foreach ( $statuswheres as $index => $statuswhere )
$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
}
foreach ( $statuswheres as $statuswhere )
$where .= " AND $statuswhere";
$where_status = implode( ' OR ', $statuswheres );
if ( ! empty( $where_status ) ) {
$where .= " AND ($where_status)";
}
} elseif ( !$this->is_singular ) {
$where .= " AND ($wpdb->posts.post_status = 'publish'";

1
tests/phpunit/tests/query.php
View File

@ -76,6 +76,5 @@ class Tests_Query extends WP_UnitTestCase {
$first_query->reset_postdata();
$this->assertEquals( get_the_ID(), $post_id );
}
}
}

10
tests/phpunit/tests/query/results.php
View File

@ -533,4 +533,14 @@ class Tests_Query_Results extends WP_UnitTestCase {
$this->assertFalse( $this->q->is_month );
$this->assertFalse( $this->q->is_year );
}
function test_perm_with_status_array() {
global $wpdb;
$this->q->query( array( 'perm' => 'readable', 'post_status' => array( 'publish', 'private' ) ) );
$this->assertTrue( $this->q->have_posts() );
$this->assertContains( "(({$wpdb->posts}.post_status = 'publish') OR ({$wpdb->posts}.post_author = 0 AND ({$wpdb->posts}.post_status = 'private')))",
$this->q->request
);
$this->assertNotContains( "({$wpdb->posts}.post_status = 'publish') AND", $this->q->request );
}
}