Changeset 39252

Timestamp:

11/15/2016 08:39:13 PM (10 years ago)

Author:

SergeyBiryukov

Message:

REST API: Remove two duplicate strings, use the ones we already have.

See #38791.

Location:

trunk/src/wp-includes/rest-api/endpoints

Files:

• class-wp-rest-comments-controller.php (modified) (5 diffs)
• class-wp-rest-posts-controller.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -342 +342 @@
                 $comment = get_comment( $id );
                 if ( empty( $comment ) ) {
-                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) );
                 }
 
@@ -348 +348 @@
                         $post = get_post( $comment->comment_post_ID );
                         if ( empty( $post ) ) {
-                                return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post id.' ), array( 'status' => 404 ) );
+                                return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );
                         }
                 }
@@ -612 +612 @@
 
                 if ( empty( $comment ) ) {
-                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) );
                 }
 
@@ -702 +702 @@
 
                 if ( ! $comment ) {
-                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) );
                 }
 
@@ -727 +727 @@
 
                 if ( empty( $comment ) ) {
-                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_comment_invalid_id', __( 'Invalid comment ID.' ), array( 'status' => 404 ) );
                 }
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -424 +424 @@
 
                 if ( empty( $id ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
-                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );
                 }
 
@@ -620 +620 @@
 
                 if ( empty( $id ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
-                        return new WP_Error( 'rest_post_invalid_id', __( 'Post id is invalid.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );
                 }
 
@@ -731 +731 @@
 
                 if ( empty( $id ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
-                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post id.' ), array( 'status' => 404 ) );
+                        return new WP_Error( 'rest_post_invalid_id', __( 'Invalid post ID.' ), array( 'status' => 404 ) );
                 }