Changeset 30579

Timestamp:

11/26/2014 08:16:47 PM (12 years ago)

Author:

ocean90

Message:

Comments: Use proper HTTP response codes for validation errors.

props miqrogroove, solarissmoke, mackensen.
fixes #11286.

Location:

trunk/src

Files:

• wp-comments-post.php (modified) (3 diffs)
• wp-includes/comment.php (modified) (2 diffs)

trunk/src/wp-comments-post.php

@@ -48 +48 @@
          */
         do_action( 'comment_closed', $comment_post_ID );
-        wp_die( __('Sorry, comments are closed for this item.') );
+        wp_die( __( 'Sorry, comments are closed for this item.' ), 403 );
 } elseif ( 'trash' == $status ) {
         /**
@@ -112 +112 @@
         }
 } else {
-        if ( get_option('comment_registration') || 'private' == $status )
-                wp_die( __('Sorry, you must be logged in to post a comment.') );
+        if ( get_option( 'comment_registration' ) || 'private' == $status ) {
+                wp_die( __( 'Sorry, you must be logged in to post a comment.' ), 403 );
+        }
 }
 
@@ -119 +120 @@
 
 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 ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
+                wp_die( __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
+        } else if ( ! is_email( $comment_author_email ) ) {
+                wp_die( __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
+        }
 }
 
-if ( '' == $comment_content )
-        wp_die( __('<strong>ERROR</strong>: please type a comment.') );
+if ( '' == $comment_content ) {
+        wp_die( __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
+}
 
 $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;

trunk/src/wp-includes/comment.php

@@ -1132 +1132 @@
                         die( __('Duplicate comment detected; it looks as though you’ve already said that!') );
                 }
-                wp_die( __('Duplicate comment detected; it looks as though you’ve already said that!') );
+                wp_die( __( 'Duplicate comment detected; it looks as though you’ve already said that!' ), 409 );
         }
 
@@ -1250 +1250 @@
                                 die( __('You are posting comments too quickly. Slow down.') );
 
-                        wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) );
+                        wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
                 }
         }