Ticket #23231: 23231.2.diff

wp-includes/comment.php

@@ -1730 +1730 @@
  * @return int The ID of the comment after adding.
  */
 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.
          *
@@ -1740 +1745 @@
         $commentdata = apply_filters( 'preprocess_comment', $commentdata );
 
         $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;
         $parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';