Changeset 19622

Timestamp:

12/21/2011 10:57:42 AM (13 years ago)

Author:

westi

Message:

Make it possible for commenter cookies to be disabled if someone wants to by setting them on an action instead of always. Fixes #17976 props SergeyBiryukov and pishmishy .

Location:

trunk

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)

trunk/wp-comments-post.php

@@ -91 +91 @@
 
 $comment = get_comment($comment_id);
-if ( !$user->ID ) {
-    $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
-    setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-    setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-    setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-}
+do_action('set_comment_cookies', $comment, $user);
 
 $location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;

trunk/wp-includes/comment.php

@@ -571 +571 @@
 }
 
+/**  
+ * Sets the cookies used to store an unauthenticated commentator's identity. Typically used  
+ * to recall previous comments by this commentator that are still held in moderation.  
+ *  
+ * @param object $comment Comment object.
+ * @param object $user Comment author's object.
+ *
+ * @since 3.4.0
+ */  
+function wp_set_comment_cookies($comment, $user) {  
+    if ( $user->ID )
+        return;
+
+    $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+    setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+}  
+
 /**
  * Sanitizes the cookies sent to the user already.

trunk/wp-includes/default-filters.php

@@ -241 +241 @@
 add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
 add_action( 'do_robots',                  'do_robots'                                      );
+add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
 add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
 add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );