Wordpress 3.6-scripts

[autoinstalls/wordpress.git] / wp-comments-post.php

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 9f1dc724c42b1e71596c52476df4a8cb0e244dd2..7b4a5e9dc07b7c270047484b7cf7501069383a67 100644 (file)
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -54,12 +54,12 @@ $comment_content      = ( isset($_POST['comment']) ) ? trim($_POST['comment']) :
 
 // If the user is logged in
 $user = wp_get_current_user();
-if ( $user->ID ) {
+if ( $user->exists() ) {
        if ( empty( $user->display_name ) )
                $user->display_name=$user->user_login;
-       $comment_author       = $wpdb->escape($user->display_name);
-       $comment_author_email = $wpdb->escape($user->user_email);
-       $comment_author_url   = $wpdb->escape($user->user_url);
+       $comment_author       = wp_slash( $user->display_name );
+       $comment_author_email = wp_slash( $user->user_email );
+       $comment_author_url   = wp_slash( $user->user_url );
        if ( current_user_can('unfiltered_html') ) {
                if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
                        kses_remove_filters(); // start with a clean slate
@@ -73,7 +73,7 @@ if ( $user->ID ) {
 
 $comment_type = '';
 
-if ( get_option('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && !$user->exists() ) {
        if ( 6 > strlen($comment_author_email) || '' == $comment_author )
                wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
        elseif ( !is_email($comment_author_email))
@@ -90,16 +90,10 @@ $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_emai
 $comment_id = wp_new_comment( $commentdata );
 
 $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;
 $location = apply_filters('comment_post_redirect', $location, $comment);
 
 wp_safe_redirect( $location );
 exit;
-?>