Changeset 46814

Timestamp:

12/05/2019 01:46:43 PM (7 years ago)

Author:

SergeyBiryukov

Message:

XML-RPC: Unify some "could not be created/updated/deleted" error messages for consistency.

Props ramiy, SergeyBiryukov.
Fixes #48883.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (13 diffs)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -1638 +1638 @@
 
                 if ( ! $post_ID ) {
-                        return new IXR_Error( 401, __( 'Sorry, your entry could not be posted.' ) );
+                        if ( $update ) {
+                                return new IXR_Error( 401, __( 'Sorry, the post could not be updated.' ) );
+                        } else {
+                                return new IXR_Error( 401, __( 'Sorry, the post could not be created.' ) );
+                        }
                 }
 
@@ -1778 +1782 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be deleted.' ) );
                 }
 
@@ -2080 +2084 @@
 
                 if ( ! $term ) {
-                        return new IXR_Error( 500, __( 'Sorry, your term could not be created.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the term could not be created.' ) );
                 }
 
@@ -2878 +2882 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the user could not be updated.' ) );
                 }
 
@@ -3377 +3381 @@
                                 return (int) $cat_id->get_error_data();
                         } else {
-                                return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
+                                return new IXR_Error( 500, __( 'Sorry, the category could not be created.' ) );
                         }
                 } elseif ( ! $cat_id ) {
-                        return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the category could not be created.' ) );
                 }
 
@@ -3789 +3793 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'Sorry, the comment could not be edited.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the comment could not be updated.' ) );
                 }
 
@@ -4980 +4984 @@
          */
         public function blogger_getTemplate( $args ) {
-                return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
+                return new IXR_Error( 403, __( 'Sorry, this method is not supported.' ) );
         }
 
@@ -4993 +4997 @@
          */
         public function blogger_setTemplate( $args ) {
-                return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
+                return new IXR_Error( 403, __( 'Sorry, this method is not supported.' ) );
         }
 
@@ -5053 +5057 @@
 
                 if ( ! $post_ID ) {
-                        return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be created.' ) );
                 }
 
@@ -5133 +5137 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'For some strange yet very annoying reason, this post could not be edited.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be updated.' ) );
                 }
                 $this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
@@ -5193 +5197 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be deleted.' ) );
                 }
 
@@ -5545 +5549 @@
 
                 if ( ! $post_ID ) {
-                        return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be created.' ) );
                 }
 
@@ -5890 +5894 @@
 
                 if ( ! $result ) {
-                        return new IXR_Error( 500, __( 'Sorry, your entry could not be edited.' ) );
+                        return new IXR_Error( 500, __( 'Sorry, the post could not be updated.' ) );
                 }