Changeset 48959 for branches/5.5/src/wp-admin/comment.php

Timestamp:

09/08/2020 10:44:56 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Comments: Check if a valid comment ID was passed when editing a comment.

This avoids a PHP notice after submitting the Edit Comment form.

Follow-up to [48050].

Props regan.khadgi.
Merges [48958] to the 5.5 branch.
Fixes #51263.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-admin/comment.php (modified) (1 diff)

branches/5.5/src/wp-admin/comment.php

@@ -37 +37 @@
 }
 
-$comment_id = absint( $_GET['c'] );
-$comment    = get_comment( $comment_id );
-
-// Prevent actions on a comment associated with a trashed post.
-if ( 'trash' === get_post_status( $comment->comment_post_ID ) ) {
-    wp_die(
-        __( 'You can’t edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' )
-    );
+if ( isset( $_REQUEST['c'] ) ) {
+    $comment_id = absint( $_REQUEST['c'] );
+    $comment    = get_comment( $comment_id );
+
+    // Prevent actions on a comment associated with a trashed post.
+    if ( $comment && 'trash' === get_post_status( $comment->comment_post_ID ) ) {
+        wp_die(
+            __( 'You can’t edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' )
+        );
+    }
+} else {
+    $comment = null;
 }