Changeset 12300

Timestamp:

12/01/2009 02:06:02 AM (15 years ago)

Author:

ryan

Message:

Accept either user_id or user_ID. Remove user_id global. see #11271 #11222

Location:

trunk

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/comment.php (modified) (2 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

@@ -1127 +1127 @@
  */
 function wp_filter_comment($commentdata) {
-    // 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['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+    elseif ( isset($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']);
@@ -1182 +1181 @@
 
     $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_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'];
+    elseif ( isset($commentdata['user_id']) )
+        $commentdata['user_id'] = (int) $commentdata['user_id'];
 
     $commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;

trunk/wp-includes/user.php

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