Changeset 28412

Timestamp:

05/15/2014 03:24:40 AM (9 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_xmlrpc_server::blogger_editPost().

See #22400.

File:

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

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

@@ -4210 +4210 @@
      * @return bool true when done.
      */
-    function blogger_editPost($args) {
+    function blogger_editPost( $args ) {
 
         $this->escape($args);
@@ -4220 +4220 @@
         $publish     = $args[5];
 
-        if ( !$user = $this->login($username, $password) )
-            return $this->error;
+        if ( ! $user = $this->login( $username, $password ) ) {
+            return $this->error;
+        }
 
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'blogger.editPost' );
 
-        $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.'));
+        $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.' ) );
+        }
 
         $this->escape($actual_post);
 
-        if ( !current_user_can('edit_post', $post_ID) )
+        if ( ! current_user_can( 'edit_post', $post_ID ) ) {
             return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
-
-        extract($actual_post, EXTR_SKIP);
-
-        if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
-            return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
-
-        $post_title = xmlrpc_getposttitle($content);
-        $post_category = xmlrpc_getpostcategory($content);
-        $post_content = xmlrpc_removepostdata($content);
-
-        $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-
-        $result = wp_update_post($postdata);
-
-        if ( !$result )
+        }
+        if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
+            return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+        }
+
+        $postdata = array();
+        $postdata['ID'] = $actual_post['ID'];
+        $postdata['post_content'] = xmlrpc_removepostdata( $content );
+        $postdata['post_title'] = xmlrpc_getposttitle( $content );
+        $postdata['post_category'] = xmlrpc_getpostcategory( $content );
+        $postdata['post_status'] = $actual_post['post_status'];
+        $postdata['post_excerpt'] = $actual_post['post_excerpt'];
+
+        $result = wp_update_post( $postdata );
+
+        if ( ! $result ) {
             return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
-
-        $this->attach_uploads( $ID, $post_content );
+        }
+        $this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
 
         /**