WordPress 3.4.2

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

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 923b03b99c0921820dcbfa16d0d3a5b360ebc242..194e00f54489aac29b19661e83c258ca2c0ffdba 100644 (file)
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -19,19 +19,29 @@ nocache_headers();
 
 $comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post_ID'] : 0;
 
 
 $comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post_ID'] : 0;
 

-$status = $wpdb->get_row( $wpdb->prepare("SELECT post_status, comment_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
+$post = get_post($comment_post_ID);

 
 

-if ( empty($status->comment_status) ) {
+if ( empty($post->comment_status) ) {

        do_action('comment_id_not_found', $comment_post_ID);
        exit;
        do_action('comment_id_not_found', $comment_post_ID);
        exit;

-} elseif ( !comments_open($comment_post_ID) ) {
+}
+
+// get_post_status() will get the parent status for attachments.
+$status = get_post_status($post);
+
+$status_obj = get_post_status_object($status);
+
+if ( !comments_open($comment_post_ID) ) {

        do_action('comment_closed', $comment_post_ID);
        wp_die( __('Sorry, comments are closed for this item.') );
        do_action('comment_closed', $comment_post_ID);
        wp_die( __('Sorry, comments are closed for this item.') );

-} elseif ( in_array($status->post_status, array('draft', 'pending') ) ) {
+} elseif ( 'trash' == $status ) {
+       do_action('comment_on_trash', $comment_post_ID);
+       exit;
+} elseif ( !$status_obj->public && !$status_obj->private ) {

        do_action('comment_on_draft', $comment_post_ID);
        exit;
        do_action('comment_on_draft', $comment_post_ID);
        exit;

-} elseif ( 'trash' == $status->post_status ) {
-       do_action('comment_on_trash', $comment_post_ID);
+} elseif ( post_password_required($comment_post_ID) ) {
+       do_action('comment_on_password_protected', $comment_post_ID);

        exit;
 } else {
        do_action('pre_comment_on_post', $comment_post_ID);
        exit;
 } else {
        do_action('pre_comment_on_post', $comment_post_ID);


@@ -44,7 +54,7 @@ $comment_content      = ( isset($_POST['comment']) ) ? trim($_POST['comment']) :
 
 // If the user is logged in
 $user = wp_get_current_user();
 
 // 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);
        if ( empty( $user->display_name ) )
                $user->display_name=$user->user_login;
        $comment_author       = $wpdb->escape($user->display_name);


@@ -57,21 +67,21 @@ if ( $user->ID ) {
                }
        }
 } else {
                }
        }
 } else {

-       if ( get_option('comment_registration') || 'private' == $status->post_status )
+       if ( get_option('comment_registration') || 'private' == $status )

                wp_die( __('Sorry, you must be logged in to post a comment.') );
 }
 
 $comment_type = '';
 
                wp_die( __('Sorry, you must be logged in to post a comment.') );
 }
 
 $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 )
        if ( 6 > strlen($comment_author_email) || '' == $comment_author )

-               wp_die( __('Error: please fill the required fields (name, email).') );
+               wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );

        elseif ( !is_email($comment_author_email))
        elseif ( !is_email($comment_author_email))

-               wp_die( __('Error: please enter a valid email address.') );
+               wp_die( __('<strong>ERROR</strong>: please enter a valid email address.') );

 }
 
 if ( '' == $comment_content )
 }
 
 if ( '' == $comment_content )

-       wp_die( __('Error: please type a comment.') );
+       wp_die( __('<strong>ERROR</strong>: please type a comment.') );

 
 $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
 
 
 $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
 


@@ -80,16 +90,10 @@ $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_emai
 $comment_id = wp_new_comment( $commentdata );
 
 $comment = get_comment($comment_id);
 $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);
 
 
 $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_redirect($location);
-
-?>
+wp_safe_redirect( $location );
+exit;