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

Timestamp:

06/30/2014 12:40:51 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Normalize 'user_id' and 'user_ID' values in wp_new_comment() before passing the comment data to 'preprocess_comment' filter.

props dkotter.
fixes #23231.

File:

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

trunk/src/wp-includes/comment.php

@@ -1743 +1743 @@
  */
 function wp_new_comment( $commentdata ) {
+    if ( isset( $commentdata['user_ID'] ) ) {
+        $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
+    }
+    $prefiltered_user_id = $commentdata['user_id'];
+
     /**
      * Filter a comment's data before it is sanitized and inserted into the database.
@@ -1753 +1758 @@
 
     $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-    if ( isset($commentdata['user_ID']) )
+    if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
         $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-    elseif ( isset($commentdata['user_id']) )
+    } elseif ( isset( $commentdata['user_id'] ) ) {
         $commentdata['user_id'] = (int) $commentdata['user_id'];
+    }
 
     $commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;