X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/1c09677af04c9e37714e09b73eb9dbc5b2e3eb13..refs/tags/wordpress-3.3.1-scripts:/wp-comments-post.php?ds=sidebyside

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 923b03b9..648388f4 100644
--- 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;
 
-$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;
-} 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.') );
-} 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;
-} 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);
@@ -57,7 +67,7 @@ if ( $user->ID ) {
 		}
 	}
 } 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.') );
 }
 
@@ -65,13 +75,13 @@ $comment_type = '';
 
 if ( get_option('require_name_email') && !$user->ID ) {
 	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))
-		wp_die( __('Error: please enter a valid email address.') );
+		wp_die( __('<strong>ERROR</strong>: please enter a valid email address.') );
 }
 
 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;
 
@@ -91,5 +101,5 @@ $location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POS
 $location = apply_filters('comment_post_redirect', $location, $comment);
 
 wp_redirect($location);
-
+exit;
 ?>