Changeset 48822 for trunk/src/wp-includes/comment.php

Timestamp:

08/19/2020 01:55:12 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Comments: Make sure the comment data passed to the preprocess_comment filter includes the comment_agent and comment_author_IP values.

Props zodiac1978, SergeyBiryukov.
Fixes #51044.

File:

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

trunk/src/wp-includes/comment.php

@@ -2189 +2189 @@
     $prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
 
+    if ( ! isset( $commentdata['comment_author_IP'] ) ) {
+        $commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
+    }
+
+    if ( ! isset( $commentdata['comment_agent'] ) ) {
+        $commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '';
+    }
+
     /**
      * Filters a comment's data before it is sanitized and inserted into the database.
      *
      * @since 1.5.0
+     * @since 5.6.0 Comment data includes the `comment_agent` and `comment_author_IP` values.
      *
      * @param array $commentdata Comment data.
@@ -2212 +2221 @@
     $commentdata['comment_parent'] = ( 'approved' === $parent_status || 'unapproved' === $parent_status ) ? $commentdata['comment_parent'] : 0;
 
-    if ( ! isset( $commentdata['comment_author_IP'] ) ) {
-        $commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
-    }
     $commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
 
-    if ( ! isset( $commentdata['comment_agent'] ) ) {
-        $commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '';
-    }
     $commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );