WordPress.org
Get WordPress

Make WordPress Core

Changeset 36480


Ignore:
Timestamp:
02/05/2016 06:49:46 PM (7 years ago)
Author:
boonebgorges
Message:

Comments: Restore the ability to bypass post_id filter using 0 or '0'.

The changes introduced in [36381], while logical and clearly awesome, introduce
the potential for much breakage. Those who want to query for comments with a
null comment_post_ID should use 'post_in' => array( 0 ) instead.

Reverts [36381], [36387].
See #35090.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/class-wp-comments-list-table.php

    r36387 r36480  
    3434     * @see WP_List_Table::__construct() for more information on default arguments.
    3535     *
    36      * @global int|bool $post_id
     36     * @global int $post_id
    3737     *
    3838     * @param array $args An associative array of arguments.
    … …  
    4141        global $post_id;
    4242
    43         $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : false;
     43        $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
    4444
    4545        if ( get_option( 'show_avatars' ) ) {
    … …  
    7070    /**
    7171     *
    72      * @global int|bool $post_id
     72     * @global int    $post_id
    7373     * @global string $comment_status
    7474     * @global string $search
    … …  
    193193    /**
    194194     *
    195      * @global int|bool $post_id
     195     * @global int $post_id
    196196     * @global string $comment_status
    197197     * @global string $comment_type
    … …  
    384384    /**
    385385     *
    386      * @global int|bool $post_id
     386     * @global int $post_id
    387387     *
    388388     * @return array

  • trunk/src/wp-includes/class-wp-comment-query.php

    r36479 r36480  
    215215     *     @type int          $post_ID                   Currently unused.
    216216     *     @type int          $post_id                   Limit results to those affiliated with a given post ID.
    217      *                                                   Default null.
     217     *                                                   Default 0.
    218218     *     @type array        $post__in                  Array of post IDs to include affiliated comments for.
    219219     *                                                   Default empty.
    … …  
    279279            'post_author__not_in' => '',
    280280            'post_ID' => '',
    281             'post_id' => null,
     281            'post_id' => 0,
    282282            'post__in' => '',
    283283            'post__not_in' => '',
    … …  
    648648        }
    649649
    650         if ( strlen( $this->query_vars['post_id'] ) ) {
    651             $this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $this->query_vars['post_id'] );
     650        $post_id = absint( $this->query_vars['post_id'] );
     651        if ( ! empty( $post_id ) ) {
     652            $this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
    652653        }
    653654

  • trunk/tests/phpunit/tests/comment/query.php

    r36479 r36480  
    3737    }
    3838
    39     /**
    40      * @ticket 35090
    41      */
    42     public function test_post_id_0_should_return_comments_with_no_parent() {
    43         $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    44         $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
     39    public function test_query_post_id_0() {
     40        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    4541
    4642        $q = new WP_Comment_Query();
    … …  
    5046        ) );
    5147
    52         $this->assertEqualSets( array( $c2 ), $found );
    53     }
    54 
    55     /**
    56      * @ticket 35090
    57      */
    58     public function test_post_id_string_0_should_return_comments_with_no_parent() {
    59         $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    60         $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
    61 
    62         $q = new WP_Comment_Query();
    63         $found = $q->query( array(
    64             'post_id' => '0',
    65             'fields' => 'ids',
    66         ) );
    67 
    68         $this->assertEqualSets( array( $c2 ), $found );
    69     }
    70 
    71     /**
    72      * @ticket 35090
    73      */
    74     public function test_post_id_null_should_be_ignored() {
    75         $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    76         $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
    77 
    78         $q = new WP_Comment_Query();
    79         $found = $q->query( array(
    80             'post_id' => null,
    81             'fields' => 'ids',
    82         ) );
    83 
    84         $this->assertEqualSets( array( $c1, $c2 ), $found );
    85     }
    86 
    87     /**
    88      * @ticket 35090
    89      */
    90     public function test_post_id_false_should_be_ignored() {
    91         $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    92         $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
    93 
    94         $q = new WP_Comment_Query();
    95         $found = $q->query( array(
    96             'post_id' => false,
    97             'fields' => 'ids',
    98         ) );
    99 
    100         $this->assertEqualSets( array( $c1, $c2 ), $found );
    101     }
    102 
    103     /**
    104      * @ticket 35090
    105      */
    106     public function test_post_id_empty_string_should_be_ignored() {
    107         $c1 = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id, 'comment_approved' => '1' ) );
    108         $c2 = self::factory()->comment->create( array( 'comment_post_ID' => 0, 'comment_approved' => '1' ) );
    109 
    110         $q = new WP_Comment_Query();
    111         $found = $q->query( array(
    112             'post_id' => '',
    113             'fields' => 'ids',
    114         ) );
    115 
    116         $this->assertEqualSets( array( $c1, $c2 ), $found );
     48        $this->assertEqualSets( array( $c1 ), $found );
    11749    }
    11850
Note: See TracChangeset for help on using the changeset viewer.