Changeset 12267

Timestamp:

11/23/2009 09:04:11 PM (17 years ago)

Author:

ryan

Message:

Standardize on user_id instead of user_ID when passing comment data. fixes #11222

Location:

trunk

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/comment.php (modified) (3 diffs)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-comments-post.php

@@ -76 +76 @@
 $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
 
-$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_id');
 
 $comment_id = wp_new_comment( $commentdata );

trunk/wp-includes/comment.php

@@ -1077 +1077 @@
  */
 function wp_filter_comment($commentdata) {
-        $commentdata['user_id']              = apply_filters('pre_user_id', $commentdata['user_ID']);
+        // user_id is preferred. user_ID is accepted for back-compat.
+        if ( isset($commentdata['user_ID']) )
+                $commentdata['user_id'] = $commentdata['user_ID'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+        else
+                $commentdata['user_id'] = $commentdata['user_ID'] = apply_filters('pre_user_id', $commentdata['user_id']);
         $commentdata['comment_agent']        = apply_filters('pre_comment_user_agent', $commentdata['comment_agent']);
         $commentdata['comment_author']       = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
@@ -1128 +1132 @@
 
         $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-        $commentdata['user_ID']         = (int) $commentdata['user_ID'];
+        // user_id is preferred. user_ID is accepted for back-compat.
+        if ( isset($commentdata['user_ID']) )
+                $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
+        else
+                $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_id'];
 
         $commentdata['comment_parent'] = absint($commentdata['comment_parent']);
@@ -1154 +1162 @@
                 $post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
 
-                if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
+                if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_id'] )
                         wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
         }

trunk/wp-includes/user.php

@@ -452 +452 @@
  */
 function setup_userdata($user_id = '') {
-        global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
+        global $user_login, $userdata, $user_level, $user_id, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
 
         if ( '' == $user_id )
@@ -465 +465 @@
         $user_login     = $user->user_login;
         $user_level     = (int) isset($user->user_level) ? $user->user_level : 0;
-        $user_ID        = (int) $user->ID;
+        $user_id = $user_ID = (int) $user->ID;
         $user_email     = $user->user_email;
         $user_url       = $user->user_url;