X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..9441756a895fb4fdc4bcf20e0d228cef622663ca:/wp-comments-post.php

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 194e00f5..2fb148a8 100644
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -17,83 +17,39 @@ require( dirname(__FILE__) . '/wp-load.php' );
 
 nocache_headers();
 
-$comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post_ID'] : 0;
-
-$post = get_post($comment_post_ID);
-
-if ( empty($post->comment_status) ) {
-	do_action('comment_id_not_found', $comment_post_ID);
-	exit;
-}
-
-// 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 ( '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 ( 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);
-}
-
-$comment_author       = ( isset($_POST['author']) )  ? trim(strip_tags($_POST['author'])) : null;
-$comment_author_email = ( isset($_POST['email']) )   ? trim($_POST['email']) : null;
-$comment_author_url   = ( isset($_POST['url']) )     ? trim($_POST['url']) : null;
-$comment_content      = ( isset($_POST['comment']) ) ? trim($_POST['comment']) : null;
-
-// If the user is logged in
-$user = wp_get_current_user();
-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);
-	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
-			kses_init_filters(); // set up the filters
-		}
+$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
+if ( is_wp_error( $comment ) ) {
+	$data = $comment->get_error_data();
+	if ( ! empty( $data ) ) {
+		wp_die( $comment->get_error_message(), $data );
+	} else {
+		exit;
 	}
-} else {
-	if ( get_option('comment_registration') || 'private' == $status )
-		wp_die( __('Sorry, you must be logged in to post a comment.') );
 }
 
-$comment_type = '';
-
-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))
-		wp_die( __('<strong>ERROR</strong>: please enter a valid email address.') );
-}
-
-if ( '' == $comment_content )
-	wp_die( __('<strong>ERROR</strong>: please type a comment.') );
-
-$comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
-
-$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+$user = wp_get_current_user();
 
-$comment_id = wp_new_comment( $commentdata );
+/**
+ * Perform other actions when comment cookies are set.
+ *
+ * @since 3.4.0
+ *
+ * @param WP_Comment $comment Comment object.
+ * @param WP_User    $user    User object. The user may not exist.
+ */
+do_action( 'set_comment_cookies', $comment, $user );
 
-$comment = get_comment($comment_id);
-do_action('set_comment_cookies', $comment, $user);
+$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
 
-$location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;
-$location = apply_filters('comment_post_redirect', $location, $comment);
+/**
+ * Filter the location URI to send the commenter after posting.
+ *
+ * @since 2.0.5
+ *
+ * @param string     $location The 'redirect_to' URI sent via $_POST.
+ * @param WP_Comment $comment  Comment object.
+ */
+$location = apply_filters( 'comment_post_redirect', $location, $comment );
 
 wp_safe_redirect( $location );
 exit;