Changeset 34454

Timestamp:

09/23/2015 02:08:47 PM (9 years ago)

Author:

boonebgorges

Message:

Bail early when invalid ID is passed to get_comment_class().

This helps to avoid PHP notices later in the function.

Props walterebert, dipesh.kakadiya, DrewAPicture.
Fixes #33947.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/comment/getCommentClass.php (modified) (1 diff)

trunk/src/wp-includes/comment-template.php

@@ -434 +434 @@
     global $comment_alt, $comment_depth, $comment_thread_alt;
 
-    $comment = get_comment($comment_id);
-
     $classes = array();
+
+    $comment = get_comment( $comment_id );
+    if ( ! $comment ) {
+        return $classes;
+    }
 
     // Get the comment type (comment, trackback),

trunk/tests/phpunit/tests/comment/getCommentClass.php

@@ -37 +37 @@
         $this->assertContains( 'bar', $classes );
     }
+
+    /**
+     * @ticket 33947
+     */
+    public function test_should_return_an_empty_array_for_invalid_comment_id() {
+        $this->assertSame( array(), get_comment_class( 'foo', 12345 ) );
+    }
 }