Changeset 52818 for trunk/src/wp-includes/comment-template.php

Timestamp:

03/03/2022 08:32:20 PM (4 years ago)

Author:

davidbaumwald

Message:

Comments: Guard against potential PHP notices in get_comment_author and get_comment_ID.

In both get_comment_author and get_comment_ID, it's possible that these functions are called without a comment context. Specifically, get_comment_author can be called without passing the $comment_ID parameter, and get_comment_ID relies on the comment global if there's no $comment parameter supplied. This leads to a PHP notice of "Trying to get property of a non-object."

This change adds a check to both functions to ensure the $comment->comment_ID property is not empty before actually using its value.

Follow-up to [52223].

Props dd32.
Fixes #54379.

File:

• trunk/src/wp-includes/comment-template.php (modified) (4 diffs)

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

@@ -23 +23 @@
  */
 function get_comment_author( $comment_ID = 0 ) {
-        $comment = get_comment( $comment_ID );
+        $comment    = get_comment( $comment_ID );
+        $comment_ID = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_ID;
 
         if ( empty( $comment->comment_author ) ) {
-                $user = $comment->user_id ? get_userdata( $comment->user_id ) : false;
+                $user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;
                 if ( $user ) {
                         $author = $user->display_name;
@@ -46 +47 @@
          * @param WP_Comment $comment    The comment object.
          */
-        return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
+        return apply_filters( 'get_comment_author', $author, $comment_ID, $comment );
 }
 
@@ -664 +665 @@
  */
 function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-        $comment = get_comment();
+        $comment    = get_comment();
+        $comment_ID = ! empty( $comment->comment_ID ) ? $comment->comment_ID : '0';
 
         /**
@@ -675 +677 @@
          * @param WP_Comment $comment    The comment object.
          */
-        return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+        return apply_filters( 'get_comment_ID', $comment_ID, $comment );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 }