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

Timestamp:

10/11/2022 04:30:40 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Comments: Consistently normalize user_ID to user_id in wp_new_comment().

For backward compatibility, the user_id parameter of wp_new_comment() can be spelled as user_ID, and plugins utilizing the preprocess_comment filter or the comment_post action should be able to receive both variations.

Follow-up to [12267], [12300], [28915], [36038], [53729].

Props peterwilsoncc, SergeyBiryukov.
Fixes #56244.

File:

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

trunk/src/wp-includes/comment.php

@@ -2209 +2209 @@
     global $wpdb;
 
+    /*
+     * Normalize `user_ID` to `user_id`, but pass the old key
+     * to the `preprocess_comment` filter for backward compatibility.
+     */
     if ( isset( $commentdata['user_ID'] ) ) {
         $commentdata['user_ID'] = (int) $commentdata['user_ID'];
         $commentdata['user_id'] = $commentdata['user_ID'];
+    } elseif ( isset( $commentdata['user_id'] ) ) {
+        $commentdata['user_id'] = (int) $commentdata['user_id'];
+        $commentdata['user_ID'] = $commentdata['user_id'];
     }
 
@@ -2236 +2243 @@
     $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
 
+    // Normalize `user_ID` to `user_id` again, after the filter.
     if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
         $commentdata['user_ID'] = (int) $commentdata['user_ID'];
@@ -2241 +2249 @@
     } elseif ( isset( $commentdata['user_id'] ) ) {
         $commentdata['user_id'] = (int) $commentdata['user_id'];
+        $commentdata['user_ID'] = $commentdata['user_id'];
     }
 
@@ -3588 +3597 @@
     $commentdata = array(
         'comment_post_ID' => $comment_post_id,
-        'user_ID'         => $user_id,
     );
 
@@ -3597 +3605 @@
         'comment_content',
         'comment_type',
-        'comment_parent'
+        'comment_parent',
+        'user_id'
     );