WordPress 4.0-scripts

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

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 194e00f54489aac29b19661e83c258ca2c0ffdba..0ed359c5bb763161ee98783ae0dd96b52c548c71 100644 (file)
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -21,8 +21,15 @@ $comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post
 
 $post = get_post($comment_post_ID);
 
 
 $post = get_post($comment_post_ID);
 

-if ( empty($post->comment_status) ) {
-       do_action('comment_id_not_found', $comment_post_ID);
+if ( empty( $post->comment_status ) ) {
+       /**
+        * Fires when a comment is attempted on a post that does not exist.
+        *
+        * @since 1.5.0
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'comment_id_not_found', $comment_post_ID );

        exit;
 }
 
        exit;
 }
 


@@ -31,20 +38,55 @@ $status = get_post_status($post);
 
 $status_obj = get_post_status_object($status);
 
 
 $status_obj = get_post_status_object($status);
 

-if ( !comments_open($comment_post_ID) ) {
-       do_action('comment_closed', $comment_post_ID);
+if ( ! comments_open( $comment_post_ID ) ) {
+       /**
+        * Fires when a comment is attempted on a post that has comments closed.
+        *
+        * @since 1.5.0
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'comment_closed', $comment_post_ID );

        wp_die( __('Sorry, comments are closed for this item.') );
 } elseif ( 'trash' == $status ) {
        wp_die( __('Sorry, comments are closed for this item.') );
 } elseif ( 'trash' == $status ) {

-       do_action('comment_on_trash', $comment_post_ID);
+       /**
+        * Fires when a comment is attempted on a trashed post.
+        *
+        * @since 2.9.0
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'comment_on_trash', $comment_post_ID );

        exit;
        exit;

-} elseif ( !$status_obj->public && !$status_obj->private ) {
-       do_action('comment_on_draft', $comment_post_ID);
+} elseif ( ! $status_obj->public && ! $status_obj->private ) {
+       /**
+        * Fires when a comment is attempted on a post in draft mode.
+        *
+        * @since 1.5.1
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'comment_on_draft', $comment_post_ID );

        exit;
        exit;

-} elseif ( post_password_required($comment_post_ID) ) {
-       do_action('comment_on_password_protected', $comment_post_ID);
+} elseif ( post_password_required( $comment_post_ID ) ) {
+       /**
+        * Fires when a comment is attempted on a password-protected post.
+        *
+        * @since 2.9.0
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'comment_on_password_protected', $comment_post_ID );

        exit;
 } else {
        exit;
 } else {

-       do_action('pre_comment_on_post', $comment_post_ID);
+       /**
+        * Fires before a comment is posted.
+        *
+        * @since 2.8.0
+        *
+        * @param int $comment_post_ID Post ID.
+        */
+       do_action( 'pre_comment_on_post', $comment_post_ID );

 }
 
 $comment_author       = ( isset($_POST['author']) )  ? trim(strip_tags($_POST['author'])) : null;
 }
 
 $comment_author       = ( isset($_POST['author']) )  ? trim(strip_tags($_POST['author'])) : null;


@@ -57,11 +99,13 @@ $user = wp_get_current_user();
 if ( $user->exists() ) {
        if ( empty( $user->display_name ) )
                $user->display_name=$user->user_login;
 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'] ) {
+       $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 ( ! isset( $_POST['_wp_unfiltered_html_comment'] )
+                       || ! wp_verify_nonce( $_POST['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
+               ) {

                        kses_remove_filters(); // start with a clean slate
                        kses_init_filters(); // set up the filters
                }
                        kses_remove_filters(); // start with a clean slate
                        kses_init_filters(); // set up the filters
                }


@@ -88,12 +132,33 @@ $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_paren
 $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
 
 $comment_id = wp_new_comment( $commentdata );
 $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
 
 $comment_id = wp_new_comment( $commentdata );

+if ( ! $comment_id ) {
+       wp_die( __( "<strong>ERROR</strong>: The comment could not be saved. Please try again later." ) );
+}
+
+$comment = get_comment( $comment_id );

 
 

-$comment = get_comment($comment_id);
-do_action('set_comment_cookies', $comment, $user);
+/**
+ * Perform other actions when comment cookies are set.
+ *
+ * @since 3.4.0
+ *
+ * @param object $comment Comment object.
+ * @param WP_User $user   User object. The user may not exist.
+ */
+do_action( 'set_comment_cookies', $comment, $user );

 
 $location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#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 object $comment  Comment object.
+ */
+$location = apply_filters( 'comment_post_redirect', $location, $comment );

 
 wp_safe_redirect( $location );
 exit;
 
 wp_safe_redirect( $location );
 exit;