Changeset 12300 for trunk/wp-includes/comment.php

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

File:

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

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;