Changeset 34798

Timestamp:

10/03/2015 02:08:43 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Merge some strings with the same meaning in wp-includes/class-wp-xmlrpc-server.php.

Props pavelevap.
Fixes #33644.

File:

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

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

@@ -1583 +1583 @@
 
         $post = get_post( $post_id, ARRAY_A );
-        if ( empty( $post['ID'] ) )
+        if ( empty( $post['ID'] ) ) {
             return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
-        if ( ! current_user_can( 'delete_post', $post_id ) )
-            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
+        }
+
+        if ( ! current_user_can( 'delete_post', $post_id ) ) {
+            return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
+        }
 
         $result = wp_delete_post( $post_id );
 
-        if ( ! $result )
+        if ( ! $result ) {
             return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+        }
 
         return true;
@@ -4686 +4689 @@
         do_action( 'xmlrpc_call', 'blogger.deletePost' );
 
-        $actual_post = get_post($post_ID,ARRAY_A);
-
-        if ( !$actual_post || $actual_post['post_type'] != 'post' )
-            return new IXR_Error(404, __('Sorry, no such post.'));
-
-        if ( !current_user_can('delete_post', $post_ID) )
-            return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
-
-        $result = wp_delete_post($post_ID);
-
-        if ( !$result )
-            return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+        $actual_post = get_post( $post_ID, ARRAY_A );
+
+        if ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
+            return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
+        }
+
+        if ( ! current_user_can( 'delete_post', $post_ID ) ) {
+            return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
+        }
+
+        $result = wp_delete_post( $post_ID );
+
+        if ( ! $result ) {
+            return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+        }
 
         /**