Ticket #33947: 33947.1.diff

src/wp-includes/comment-template.php

@@ -433 +433 @@
 function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
         global $comment_alt, $comment_depth, $comment_thread_alt;
 
-        $comment = get_comment($comment_id);
+        $comment = get_comment( $comment_id );
 
+        // Verify if comment is a WP_Comment object.
+        if ( ! $comment instanceof WP_Comment ) {
+                return array();
+        }
+
         $classes = array();
 
         // Get the comment type (comment, trackback),
@@ -441 +446 @@
         $classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
 
         // Add classes for comment authors that are registered users.
-        if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
+        if ( ! empty( $comment->user_id ) && $user = get_userdata( $comment->user_id ) ) {
                 $classes[] = 'byuser';
                 $classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
                 // For comment authors who are the author of the post
-                if ( $post = get_post($post_id) ) {
+                if ( $post = get_post( $post_id ) ) {
                         if ( $comment->user_id === $post->post_author ) {
                                 $classes[] = 'bypostauthor';
                         }
@@ -452 +457 @@
                 }
         }
 
-        if ( empty($comment_alt) )
+        if ( empty( $comment_alt ) ) {
                 $comment_alt = 0;
-        if ( empty($comment_depth) )
+        }
+
+        if ( empty( $comment_depth ) ) {
                 $comment_depth = 1;
-        if ( empty($comment_thread_alt) )
+        }
+
+        if ( empty( $comment_thread_alt ) ) {
                 $comment_thread_alt = 0;
+        }
 
         if ( $comment_alt % 2 ) {
                 $classes[] = 'odd';
@@ -481 +491 @@
 
         $classes[] = "depth-$comment_depth";
 
-        if ( !empty($class) ) {
-                if ( !is_array( $class ) )
-                        $class = preg_split('#\s+#', $class);
-                $classes = array_merge($classes, $class);
+        if ( ! empty( $class ) ) {
+                if ( ! is_array( $class ) ) {
+                        $class = preg_split( '#\s+#', $class );
+                }
+                $classes = array_merge( $classes, $class );
         }
 
-        $classes = array_map('esc_attr', $classes);
+        $classes = array_map( 'esc_attr', $classes );
 
         /**
          * Filter the returned CSS classes for the current comment.

tests/phpunit/tests/comment/template.php

@@ -30 +30 @@
                 $this->assertEquals( 12, get_comments_number() );
         }
 
-}
- No newline at end of file
+        /**
+         * @ticket 33947
+         */
+        public function test_get_comment_class_with_comment_id() {
+                $post_id    = $this->factory->post->create();
+                $comment_id = $this->factory->comment->create( array( 'comment_post_ID' => $post_id ) );
+
+                $classes1 = get_comment_class( array( 'test' ), $comment_id );
+                $this->assertContains( 'test', $classes1 );
+                $this->assertContains( 'comment', $classes1 );
+
+                $classes2 = get_comment_class( 'test', $comment_id );
+                $this->assertContains( 'test', $classes2 );
+                $this->assertContains( 'comment', $classes2 );
+
+                $obj_comment = get_comment( $comment_id );
+                $classes3 = get_comment_class( 'test', $obj_comment );
+                $this->assertContains( 'test', $classes3 );
+                $this->assertContains( 'comment', $classes3 );
+
+                wp_delete_comment( $comment_id, true );
+
+                $classes4 = get_comment_class( 'test', $comment_id );
+                $this->assertEquals( array(), $classes4 );
+        }
+
+}