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

get_comment_count() currently increments awaiting_moderation when comments are in the trash. This occurs because case 0: will match any value passed to switch that is a string that isn't specified in the list of cases. This is terrifying.

Browse Source 
* Cases for `0` and `1` should be `'1'` and `'0'`
* Add unit tests for `get_comment_count()`. Currently, there are none.

See #33414.


git-svn-id: https://develop.svn.wordpress.org/trunk@33806 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-08-30 02:18:18 +00:00
parent 0c7f2237f0
commit da0a823129
2 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/comment-functions.php
View File

@ -375,11 +375,11 @@ function get_comment_count( $post_id = 0 ) {
$comment_count['spam'] = $row['total']; $comment_count['spam'] = $row['total'];
$comment_count["total_comments"] += $row['total']; $comment_count["total_comments"] += $row['total'];
break; break;
case 1: case '1':
$comment_count['approved'] = $row['total']; $comment_count['approved'] = $row['total'];
$comment_count['total_comments'] += $row['total']; $comment_count['total_comments'] += $row['total'];
break; break;
case 0: case '0':
$comment_count['awaiting_moderation'] = $row['total']; $comment_count['awaiting_moderation'] = $row['total'];
$comment_count['total_comments'] += $row['total']; $comment_count['total_comments'] += $row['total'];
break; break;

65
tests/phpunit/tests/comment/getCommentCount.php Normal file
View File

@ -0,0 +1,65 @@
<?php
class Tests_Get_Comment_Count extends WP_UnitTestCase {
public function test_get_comment_count() {
$count = get_comment_count();
$this->assertEquals( 0, $count['approved'] );
$this->assertEquals( 0, $count['awaiting_moderation'] );
$this->assertEquals( 0, $count['spam'] );
$this->assertEquals( 0, $count['total_comments'] );
}
public function test_get_comment_count_approved() {
$this->factory->comment->create( array(
'comment_approved' => 1
) );
$count = get_comment_count();
$this->assertEquals( 1, $count['approved'] );
$this->assertEquals( 0, $count['awaiting_moderation'] );
$this->assertEquals( 0, $count['spam'] );
$this->assertEquals( 1, $count['total_comments'] );
}
public function test_get_comment_count_awaiting() {
$this->factory->comment->create( array(
'comment_approved' => 0
) );
$count = get_comment_count();
$this->assertEquals( 0, $count['approved'] );
$this->assertEquals( 1, $count['awaiting_moderation'] );
$this->assertEquals( 0, $count['spam'] );
$this->assertEquals( 1, $count['total_comments'] );
}
public function test_get_comment_count_spam() {
$this->factory->comment->create( array(
'comment_approved' => 'spam'
) );
$count = get_comment_count();
$this->assertEquals( 0, $count['approved'] );
$this->assertEquals( 0, $count['awaiting_moderation'] );
$this->assertEquals( 1, $count['spam'] );
$this->assertEquals( 1, $count['total_comments'] );
}
public function test_get_comment_count_trash() {
$this->factory->comment->create( array(
'comment_approved' => 'trash'
) );
$count = get_comment_count();
$this->assertEquals( 0, $count['approved'] );
$this->assertEquals( 0, $count['awaiting_moderation'] );
$this->assertEquals( 0, $count['spam'] );
$this->assertEquals( 0, $count['total_comments'] );
}
}