Ticket #20662: 20662.2.diff

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

@@ -1193 +1193 @@
         }
 
         /**
+         * @since 4.3.0
+         *
+         * @param array $post_data
+         * @param bool  $update
+         * @return void|IXR_Error
+         */
+        private function _toggle_sticky( $post_data, $update = false ) {
+                $post_type = get_post_type_object( $post_data['post_type'] );
+
+                // Private and password-protected posts cannot be stickied.
+                if ( 'private' === $post_data['post_status'] || ! empty( $post_data['post_password'] ) ) {
+                        // Error if the client tried to stick the post, otherwise, silently unstick.
+                        if ( ! empty( $post_data['sticky'] ) ) {
+                                return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
+                        }
+
+                        if ( $update ) {
+                                unstick_post( $post_data['ID'] );
+                        }
+                } elseif ( isset( $post_data['sticky'] ) )  {
+                        if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
+                                return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
+                        }
+
+                        $sticky = wp_validate_boolean( $post_data['sticky'] );
+                        if ( $sticky ) {
+                                stick_post( $post_data['ID'] );
+                        } else {
+                                unstick_post( $post_data['ID'] );
+                        }
+                }
+        }
+
+        /**
          * Helper method for wp_newPost() and wp_editPost(), containing shared logic.
          *
          * @since 3.4.0
@@ -1287 +1321 @@
                 $post_ID = $post_data['ID'];
 
                 if ( $post_data['post_type'] == 'post' ) {
-                        // Private and password-protected posts cannot be stickied.
-                        if ( $post_data['post_status'] == 'private' || ! empty( $post_data['post_password'] ) ) {
-                                // Error if the client tried to stick the post, otherwise, silently unstick.
-                                if ( ! empty( $post_data['sticky'] ) )
-                                        return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
-                                if ( $update )
-                                        unstick_post( $post_ID );
-                        } elseif ( isset( $post_data['sticky'] ) )  {
-                                if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
-                                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
-                                if ( $post_data['sticky'] )
-                                        stick_post( $post_ID );
-                                else
-                                        unstick_post( $post_ID );
+                        $error = $this->_toggle_sticky( $post_data, $update );
+                        if ( $error ) {
+                                return $error;
                         }
                 }
 
@@ -4902 +4925 @@
 
                 // Only posts can be sticky
                 if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-                        if ( $content_struct['sticky'] == true )
-                                stick_post( $post_ID );
-                        elseif ( $content_struct['sticky'] == false )
-                                unstick_post( $post_ID );
+                        $data = $postdata;
+                        $data['sticky'] = $content_struct['sticky'];
+                        $error = $this->_toggle_sticky( $data );
+                        if ( $error ) {
+                                return $error;
+                        }
                 }
 
                 if ( isset($content_struct['custom_fields']) )
@@ -5250 +5275 @@
 
                 // Only posts can be sticky
                 if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-                        if ( $content_struct['sticky'] == true )
-                                stick_post( $post_ID );
-                        elseif ( $content_struct['sticky'] == false )
-                                unstick_post( $post_ID );
+                        $data = $newpost;
+                        $data['sticky'] = $content_struct['sticky'];
+                        $error = $this->_toggle_sticky( $data, true );
+                        if ( $error ) {
+                                return $error;
+                        }
                 }
 
                 if ( isset($content_struct['custom_fields']) )