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

Timestamp:

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

Author:

ryan

Message:

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

File:

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

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']);
     }