Changes in trunk/wp-comments-post.php [2984:4260]

File:

• trunk/wp-comments-post.php (modified) (2 diffs)

trunk/wp-comments-post.php

@@ -13 +13 @@
 } elseif ( 'closed' ==  $status->comment_status ) {
         do_action('comment_closed', $comment_post_ID);
-        die( __('Sorry, comments are closed for this item.') );
+        wp_die( __('Sorry, comments are closed for this item.') );
 } elseif ( 'draft' == $status->post_status ) {
         do_action('comment_on_draft', $comment_post_ID);
@@ -25 +25 @@
 
 // If the user is logged in
-get_currentuserinfo();
-if ( $user_ID ) :
-        $comment_author       = $wpdb->escape($user_identity);
-        $comment_author_email = $wpdb->escape($user_email);
-        $comment_author_url   = $wpdb->escape($user_url);
+$user = wp_get_current_user();
+if ( $user->ID ) :
+        $comment_author       = $wpdb->escape($user->display_name);
+        $comment_author_email = $wpdb->escape($user->user_email);
+        $comment_author_url   = $wpdb->escape($user->user_url);
 else :
         if ( get_option('comment_registration') )
-                die( __('Sorry, you must be logged in to post a comment.') );
+                wp_die( __('Sorry, you must be logged in to post a comment.') );
 endif;
 
 $comment_type = '';
 
-if ( get_settings('require_name_email') && !$user_ID ) {
+if ( get_option('require_name_email') && !$user->ID ) {
         if ( 6 > strlen($comment_author_email) || '' == $comment_author )
-                die( __('Error: please fill the required fields (name, email).') );
+                wp_die( __('Error: please fill the required fields (name, email).') );
         elseif ( !is_email($comment_author_email))
-                die( __('Error: please enter a valid email address.') );
+                wp_die( __('Error: please enter a valid email address.') );
 }
 
 if ( '' == $comment_content )
-        die( __('Error: please type a comment.') );
+        wp_die( __('Error: please type a comment.') );
 
 $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'user_ID');
 
-wp_new_comment( $commentdata );
+$comment_id = wp_new_comment( $commentdata );
 
-if ( !$user_ID ) :
-        setcookie('comment_author_' . COOKIEHASH, stripslashes($comment_author), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-        setcookie('comment_author_email_' . COOKIEHASH, stripslashes($comment_author_email), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-        setcookie('comment_author_url_' . COOKIEHASH, stripslashes($comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+$comment = get_comment($comment_id);
+if ( !$user->ID ) :
+        setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+        setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+        setcookie('comment_author_url_' . COOKIEHASH, clean_url($comment->comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
 endif;
 
-$location = ( empty( $_POST['redirect_to'] ) ) ? get_permalink( $comment_post_ID ) : $_POST['redirect_to']; 
+$location = ( empty($_POST['redirect_to']) ? get_permalink($comment_post_ID) : $_POST['redirect_to'] ) . '#comment-' . $comment_id;
+$location = apply_filters('comment_post_redirect', $location, $comment);
 
-wp_redirect( $location );
+wp_redirect($location);
 
 ?>