Changeset 46335

Timestamp:

09/27/2019 02:45:49 PM (5 years ago)

Author:

whyisjake

Message:

Comments: Avoid PHP notice in get_comment_reply_link() for null comment.

If there is no global comment, or the input comment is null, return early to prevent warnings.

Fixes #41846
Props birgire, earnjam

Location:

trunk

Files:

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

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

@@ -1646 +1646 @@
 
     $comment = get_comment( $comment );
+
+    if ( empty( $comment ) ) {
+        return;
+    }
 
     if ( empty( $post ) ) {

trunk/tests/phpunit/tests/comment/getCommentReplyLink.php

@@ -67 +67 @@
         $this->assertContains( $expected_url, $comment_reply_link );
     }
+
+    /**
+     * @ticket 41846
+     */
+    public function test_should_return_null_when_depth_less_than_max_depth_and_comment_null_and_no_current_global_comment() {
+
+        // Let max depth be greater than depth and depth be non-zero.
+        $args = array(
+            'depth'     => 1,
+            'max_depth' => 2,
+        );
+
+        // Make sure there's no global comment object.
+        add_filter( 'get_comment', '__return_null' );
+
+        $actual = get_comment_reply_link( $args );
+
+        $this->assertNull( $actual );
+    }
+
 }