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

Timestamp:

07/01/2015 12:07:28 PM (10 years ago)

Author:

boonebgorges

Message:

Allow 'comment_agent' and 'comment_author_IP' to be set via wp_new_comment().

Props mrutz, wonderboymusic, rachelbaker.
Fixes #14601.

File:

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

trunk/src/wp-includes/comment.php

@@ -2272 +2272 @@
  *
  * @since 1.5.0
+ * @since 4.3.0 'comment_agent' and 'comment_author_IP' can be set via `$commentdata`.
  *
  * @see wp_insert_comment()
@@ -2310 +2311 @@
     $commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
 
-    $commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '',$_SERVER['REMOTE_ADDR'] );
-    $commentdata['comment_agent']     = isset( $_SERVER['HTTP_USER_AGENT'] ) ? substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 ) : '';
+    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 );
 
     if ( empty( $commentdata['comment_date'] ) ) {