WordPress 4.3
[autoinstalls/wordpress.git] / wp-includes / class-wp-xmlrpc-server.php
index 9d92cecff02e6a2b3356577d7a187c34bf85503c..8e7bfb6ce2dd27b92e2eef90c9299b328c6b6661 100644 (file)
@@ -3,23 +3,47 @@
  * XML-RPC protocol support for WordPress
  *
  * @package WordPress
+ * @subpackage Publishing
  */
 
 /**
  * WordPress XMLRPC server implementation.
  *
- * Implements compatability for Blogger API, MetaWeblog API, MovableType, and
+ * Implements compatibility for Blogger API, MetaWeblog API, MovableType, and
  * pingback. Additional WordPress API for managing comments, pages, posts,
  * options, etc.
  *
- * Since WordPress 2.6.0, WordPress XMLRPC server can be disabled in the
- * administration panels.
+ * As of WordPress 3.5.0, XML-RPC is enabled by default. It can be disabled
+ * via the xmlrpc_enabled filter found in wp_xmlrpc_server::login().
  *
  * @package WordPress
  * @subpackage Publishing
  * @since 1.5.0
  */
 class wp_xmlrpc_server extends IXR_Server {
+       /**
+        * Methods.
+        *
+        * @access public
+        * @var array
+        */
+       public $methods;
+
+       /**
+        * Blog options.
+        *
+        * @access public
+        * @var array
+        */
+       public $blog_options;
+
+       /**
+        * IXR_Error instance.
+        *
+        * @access public
+        * @var IXR_Error
+        */
+       public $error;
 
        /**
         * Register all of the XMLRPC methods that XMLRPC server understands.
@@ -29,13 +53,27 @@ class wp_xmlrpc_server extends IXR_Server {
         * or replace XMLRPC methods.
         *
         * @since 1.5.0
-        *
-        * @return wp_xmlrpc_server
         */
-       function __construct() {
+       public function __construct() {
                $this->methods = array(
                        // WordPress API
                        'wp.getUsersBlogs'              => 'this:wp_getUsersBlogs',
+                       'wp.newPost'                    => 'this:wp_newPost',
+                       'wp.editPost'                   => 'this:wp_editPost',
+                       'wp.deletePost'                 => 'this:wp_deletePost',
+                       'wp.getPost'                    => 'this:wp_getPost',
+                       'wp.getPosts'                   => 'this:wp_getPosts',
+                       'wp.newTerm'                    => 'this:wp_newTerm',
+                       'wp.editTerm'                   => 'this:wp_editTerm',
+                       'wp.deleteTerm'                 => 'this:wp_deleteTerm',
+                       'wp.getTerm'                    => 'this:wp_getTerm',
+                       'wp.getTerms'                   => 'this:wp_getTerms',
+                       'wp.getTaxonomy'                => 'this:wp_getTaxonomy',
+                       'wp.getTaxonomies'              => 'this:wp_getTaxonomies',
+                       'wp.getUser'                    => 'this:wp_getUser',
+                       'wp.getUsers'                   => 'this:wp_getUsers',
+                       'wp.getProfile'                 => 'this:wp_getProfile',
+                       'wp.editProfile'                => 'this:wp_editProfile',
                        'wp.getPage'                    => 'this:wp_getPage',
                        'wp.getPages'                   => 'this:wp_getPages',
                        'wp.newPage'                    => 'this:wp_newPage',
@@ -49,6 +87,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        'wp.deleteCategory'             => 'this:wp_deleteCategory',
                        'wp.suggestCategories'  => 'this:wp_suggestCategories',
                        'wp.uploadFile'                 => 'this:mw_newMediaObject',    // Alias
+                       'wp.deleteFile'                 => 'this:wp_deletePost',                // Alias
                        'wp.getCommentCount'    => 'this:wp_getCommentCount',
                        'wp.getPostStatusList'  => 'this:wp_getPostStatusList',
                        'wp.getPageStatusList'  => 'this:wp_getPageStatusList',
@@ -64,14 +103,16 @@ class wp_xmlrpc_server extends IXR_Server {
                        'wp.getMediaItem'               => 'this:wp_getMediaItem',
                        'wp.getMediaLibrary'    => 'this:wp_getMediaLibrary',
                        'wp.getPostFormats'     => 'this:wp_getPostFormats',
+                       'wp.getPostType'                => 'this:wp_getPostType',
+                       'wp.getPostTypes'               => 'this:wp_getPostTypes',
+                       'wp.getRevisions'               => 'this:wp_getRevisions',
+                       'wp.restoreRevision'    => 'this:wp_restoreRevision',
 
                        // Blogger API
                        'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
                        'blogger.getUserInfo' => 'this:blogger_getUserInfo',
                        'blogger.getPost' => 'this:blogger_getPost',
                        'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
-                       'blogger.getTemplate' => 'this:blogger_getTemplate',
-                       'blogger.setTemplate' => 'this:blogger_setTemplate',
                        'blogger.newPost' => 'this:blogger_newPost',
                        'blogger.editPost' => 'this:blogger_editPost',
                        'blogger.deletePost' => 'this:blogger_deletePost',
@@ -87,8 +128,6 @@ class wp_xmlrpc_server extends IXR_Server {
                        // MetaWeblog API aliases for Blogger API
                        // see http://www.xmlrpc.com/stories/storyReader$2460
                        'metaWeblog.deletePost' => 'this:blogger_deletePost',
-                       'metaWeblog.getTemplate' => 'this:blogger_getTemplate',
-                       'metaWeblog.setTemplate' => 'this:blogger_setTemplate',
                        'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
 
                        // MovableType API
@@ -109,11 +148,41 @@ class wp_xmlrpc_server extends IXR_Server {
                        'demo.addTwoNumbers' => 'this:addTwoNumbers'
                );
 
-               $this->initialise_blog_option_info( );
-               $this->methods = apply_filters('xmlrpc_methods', $this->methods);
+               $this->initialise_blog_option_info();
+
+               /**
+                * Filter the methods exposed by the XML-RPC server.
+                *
+                * This filter can be used to add new methods, and remove built-in methods.
+                *
+                * @since 1.5.0
+                *
+                * @param array $methods An array of XML-RPC methods.
+                */
+               $this->methods = apply_filters( 'xmlrpc_methods', $this->methods );
+       }
+
+       /**
+        * Make private/protected methods readable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param callable $name      Method to call.
+        * @param array    $arguments Arguments to pass when calling.
+        * @return array|IXR_Error|false Return value of the callback, false otherwise.
+        */
+       public function __call( $name, $arguments ) {
+               if ( '_multisite_getUsersBlogs' === $name ) {
+                       return call_user_func_array( array( $this, $name ), $arguments );
+               }
+               return false;
        }
 
-       function serve_request() {
+       /**
+        * @access public
+        */
+       public function serve_request() {
                $this->IXR_Server($this->methods);
        }
 
@@ -122,10 +191,9 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method Parameters.
-        * @return string
+        * @return string Hello string response.
         */
-       function sayHello($args) {
+       public function sayHello() {
                return 'Hello!';
        }
 
@@ -134,307 +202,2372 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method Parameters.
-        * @return int
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int $number1 A number to add.
+        *     @type int $number2 A second number to add.
+        * }
+        * @return int Sum of the two given numbers.
         */
-       function addTwoNumbers($args) {
+       public function addTwoNumbers( $args ) {
                $number1 = $args[0];
                $number2 = $args[1];
                return $number1 + $number2;
        }
 
        /**
-        * Check user's credentials.
+        * Log user in.
         *
-        * @since 1.5.0
+        * @since 2.8.0
         *
-        * @param string $user_login User's username.
-        * @param string $user_pass User's password.
-        * @return bool Whether authentication passed.
-        * @deprecated use wp_xmlrpc_server::login
-        * @see wp_xmlrpc_server::login
+        * @param string $username User's username.
+        * @param string $password User's password.
+        * @return WP_User|bool WP_User object if authentication passed, false otherwise
         */
-       function login_pass_ok($user_login, $user_pass) {
-               if ( !get_option( 'enable_xmlrpc' ) ) {
-                       $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.  An admin user can enable them at %s'),  admin_url('options-writing.php') ) );
+       public function login( $username, $password ) {
+               /*
+                * Respect old get_option() filters left for back-compat when the 'enable_xmlrpc'
+                * option was deprecated in 3.5.0. Use the 'xmlrpc_enabled' hook instead.
+                */
+               $enabled = apply_filters( 'pre_option_enable_xmlrpc', false );
+               if ( false === $enabled ) {
+                       $enabled = apply_filters( 'option_enable_xmlrpc', true );
+               }
+
+               /**
+                * Filter whether XML-RPC is enabled.
+                *
+                * This is the proper filter for turning off XML-RPC.
+                *
+                * @since 3.5.0
+                *
+                * @param bool $enabled Whether XML-RPC is enabled. Default true.
+                */
+               $enabled = apply_filters( 'xmlrpc_enabled', $enabled );
+
+               if ( ! $enabled ) {
+                       $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
                        return false;
                }
 
-               if (!user_pass_ok($user_login, $user_pass)) {
-                       $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
+               $user = wp_authenticate($username, $password);
+
+               if (is_wp_error($user)) {
+                       $this->error = new IXR_Error( 403, __( 'Incorrect username or password.' ) );
+
+                       /**
+                        * Filter the XML-RPC user login error message.
+                        *
+                        * @since 3.5.0
+                        *
+                        * @param string  $error The XML-RPC error message.
+                        * @param WP_User $user  WP_User object.
+                        */
+                       $this->error = apply_filters( 'xmlrpc_login_error', $this->error, $user );
                        return false;
                }
-               return true;
+
+               wp_set_current_user( $user->ID );
+               return $user;
        }
 
        /**
-        * Log user in.
+        * Check user's credentials. Deprecated.
         *
-        * @since 2.8
+        * @since 1.5.0
+        * @deprecated 2.8.0
+        * @deprecated use wp_xmlrpc_server::login
+        * @see wp_xmlrpc_server::login
         *
         * @param string $username User's username.
         * @param string $password User's password.
-        * @return mixed WP_User object if authentication passed, false otherwise
+        * @return bool Whether authentication passed.
         */
-       function login($username, $password) {
-               if ( !get_option( 'enable_xmlrpc' ) ) {
-                       $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.  An admin user can enable them at %s'),  admin_url('options-writing.php') ) );
-                       return false;
+       public function login_pass_ok( $username, $password ) {
+               return (bool) $this->login( $username, $password );
+       }
+
+       /**
+        * Escape string or array of strings for database.
+        *
+        * @since 1.5.2
+        *
+        * @param string|array $data Escape single string or array of strings.
+        * @return string|void Returns with string is passed, alters by-reference
+        *                     when array is passed.
+        */
+       public function escape( &$data ) {
+               if ( ! is_array( $data ) )
+                       return wp_slash( $data );
+
+               foreach ( $data as &$v ) {
+                       if ( is_array( $v ) )
+                               $this->escape( $v );
+                       elseif ( ! is_object( $v ) )
+                               $v = wp_slash( $v );
                }
+       }
 
-               $user = wp_authenticate($username, $password);
+       /**
+        * Retrieve custom fields for post.
+        *
+        * @since 2.5.0
+        *
+        * @param int $post_id Post ID.
+        * @return array Custom fields, if exist.
+        */
+       public function get_custom_fields($post_id) {
+               $post_id = (int) $post_id;
 
-               if (is_wp_error($user)) {
-                       $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
+               $custom_fields = array();
+
+               foreach ( (array) has_meta($post_id) as $meta ) {
+                       // Don't expose protected fields.
+                       if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) )
+                               continue;
+
+                       $custom_fields[] = array(
+                               "id"    => $meta['meta_id'],
+                               "key"   => $meta['meta_key'],
+                               "value" => $meta['meta_value']
+                       );
+               }
+
+               return $custom_fields;
+       }
+
+       /**
+        * Set custom fields for post.
+        *
+        * @since 2.5.0
+        *
+        * @param int $post_id Post ID.
+        * @param array $fields Custom fields.
+        */
+       public function set_custom_fields($post_id, $fields) {
+               $post_id = (int) $post_id;
+
+               foreach ( (array) $fields as $meta ) {
+                       if ( isset($meta['id']) ) {
+                               $meta['id'] = (int) $meta['id'];
+                               $pmeta = get_metadata_by_mid( 'post', $meta['id'] );
+                               if ( isset($meta['key']) ) {
+                                       $meta['key'] = wp_unslash( $meta['key'] );
+                                       if ( $meta['key'] !== $pmeta->meta_key )
+                                               continue;
+                                       $meta['value'] = wp_unslash( $meta['value'] );
+                                       if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) )
+                                               update_metadata_by_mid( 'post', $meta['id'], $meta['value'] );
+                               } elseif ( current_user_can( 'delete_post_meta', $post_id, $pmeta->meta_key ) ) {
+                                       delete_metadata_by_mid( 'post', $meta['id'] );
+                               }
+                       } elseif ( current_user_can( 'add_post_meta', $post_id, wp_unslash( $meta['key'] ) ) ) {
+                               add_post_meta( $post_id, $meta['key'], $meta['value'] );
+                       }
+               }
+       }
+
+       /**
+        * Set up blog options property.
+        *
+        * Passes property through {@see 'xmlrpc_blog_options'} filter.
+        *
+        * @since 2.6.0
+        *
+        * @global string $wp_version
+        */
+       public function initialise_blog_option_info() {
+               global $wp_version;
+
+               $this->blog_options = array(
+                       // Read only options
+                       'software_name'     => array(
+                               'desc'          => __( 'Software Name' ),
+                               'readonly'      => true,
+                               'value'         => 'WordPress'
+                       ),
+                       'software_version'  => array(
+                               'desc'          => __( 'Software Version' ),
+                               'readonly'      => true,
+                               'value'         => $wp_version
+                       ),
+                       'blog_url'          => array(
+                               'desc'          => __( 'WordPress Address (URL)' ),
+                               'readonly'      => true,
+                               'option'        => 'siteurl'
+                       ),
+                       'home_url'          => array(
+                               'desc'          => __( 'Site Address (URL)' ),
+                               'readonly'      => true,
+                               'option'        => 'home'
+                       ),
+                       'login_url'          => array(
+                               'desc'          => __( 'Login Address (URL)' ),
+                               'readonly'      => true,
+                               'value'         => wp_login_url( )
+                       ),
+                       'admin_url'          => array(
+                               'desc'          => __( 'The URL to the admin area' ),
+                               'readonly'      => true,
+                               'value'         => get_admin_url( )
+                       ),
+                       'image_default_link_type' => array(
+                               'desc'          => __( 'Image default link type' ),
+                               'readonly'      => true,
+                               'option'        => 'image_default_link_type'
+                       ),
+                       'image_default_size' => array(
+                               'desc'          => __( 'Image default size' ),
+                               'readonly'      => true,
+                               'option'        => 'image_default_size'
+                       ),
+                       'image_default_align' => array(
+                               'desc'          => __( 'Image default align' ),
+                               'readonly'      => true,
+                               'option'        => 'image_default_align'
+                       ),
+                       'template'          => array(
+                               'desc'          => __( 'Template' ),
+                               'readonly'      => true,
+                               'option'        => 'template'
+                       ),
+                       'stylesheet'        => array(
+                               'desc'          => __( 'Stylesheet' ),
+                               'readonly'      => true,
+                               'option'        => 'stylesheet'
+                       ),
+                       'post_thumbnail'    => array(
+                               'desc'          => __('Post Thumbnail'),
+                               'readonly'      => true,
+                               'value'         => current_theme_supports( 'post-thumbnails' )
+                       ),
+
+                       // Updatable options
+                       'time_zone'         => array(
+                               'desc'          => __( 'Time Zone' ),
+                               'readonly'      => false,
+                               'option'        => 'gmt_offset'
+                       ),
+                       'blog_title'        => array(
+                               'desc'          => __( 'Site Title' ),
+                               'readonly'      => false,
+                               'option'        => 'blogname'
+                       ),
+                       'blog_tagline'      => array(
+                               'desc'          => __( 'Site Tagline' ),
+                               'readonly'      => false,
+                               'option'        => 'blogdescription'
+                       ),
+                       'date_format'       => array(
+                               'desc'          => __( 'Date Format' ),
+                               'readonly'      => false,
+                               'option'        => 'date_format'
+                       ),
+                       'time_format'       => array(
+                               'desc'          => __( 'Time Format' ),
+                               'readonly'      => false,
+                               'option'        => 'time_format'
+                       ),
+                       'users_can_register' => array(
+                               'desc'          => __( 'Allow new users to sign up' ),
+                               'readonly'      => false,
+                               'option'        => 'users_can_register'
+                       ),
+                       'thumbnail_size_w'  => array(
+                               'desc'          => __( 'Thumbnail Width' ),
+                               'readonly'      => false,
+                               'option'        => 'thumbnail_size_w'
+                       ),
+                       'thumbnail_size_h'  => array(
+                               'desc'          => __( 'Thumbnail Height' ),
+                               'readonly'      => false,
+                               'option'        => 'thumbnail_size_h'
+                       ),
+                       'thumbnail_crop'    => array(
+                               'desc'          => __( 'Crop thumbnail to exact dimensions' ),
+                               'readonly'      => false,
+                               'option'        => 'thumbnail_crop'
+                       ),
+                       'medium_size_w'     => array(
+                               'desc'          => __( 'Medium size image width' ),
+                               'readonly'      => false,
+                               'option'        => 'medium_size_w'
+                       ),
+                       'medium_size_h'     => array(
+                               'desc'          => __( 'Medium size image height' ),
+                               'readonly'      => false,
+                               'option'        => 'medium_size_h'
+                       ),
+                       'large_size_w'      => array(
+                               'desc'          => __( 'Large size image width' ),
+                               'readonly'      => false,
+                               'option'        => 'large_size_w'
+                       ),
+                       'large_size_h'      => array(
+                               'desc'          => __( 'Large size image height' ),
+                               'readonly'      => false,
+                               'option'        => 'large_size_h'
+                       ),
+                       'default_comment_status' => array(
+                               'desc'          => __( 'Allow people to post comments on new articles' ),
+                               'readonly'      => false,
+                               'option'        => 'default_comment_status'
+                       ),
+                       'default_ping_status' => array(
+                               'desc'          => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
+                               'readonly'      => false,
+                               'option'        => 'default_ping_status'
+                       )
+               );
+
+               /**
+                * Filter the XML-RPC blog options property.
+                *
+                * @since 2.6.0
+                *
+                * @param array $blog_options An array of XML-RPC blog options.
+                */
+               $this->blog_options = apply_filters( 'xmlrpc_blog_options', $this->blog_options );
+       }
+
+       /**
+        * Retrieve the blogs of the user.
+        *
+        * @since 2.6.0
+        *
+        * @param array $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type string $username Username.
+        *     @type string $password Password.
+        * }
+        * @return array|IXR_Error Array contains:
+        *  - 'isAdmin'
+        *  - 'url'
+        *  - 'blogid'
+        *  - 'blogName'
+        *  - 'xmlrpc' - url of xmlrpc endpoint
+        */
+       public function wp_getUsersBlogs( $args ) {
+               // If this isn't on WPMU then just use blogger_getUsersBlogs
+               if ( !is_multisite() ) {
+                       array_unshift( $args, 1 );
+                       return $this->blogger_getUsersBlogs( $args );
+               }
+
+               $this->escape( $args );
+
+               $username = $args[0];
+               $password = $args[1];
+
+               if ( !$user = $this->login($username, $password) )
+                       return $this->error;
+
+               /**
+                * Fires after the XML-RPC user has been authenticated but before the rest of
+                * the method logic begins.
+                *
+                * All built-in XML-RPC methods use the action xmlrpc_call, with a parameter
+                * equal to the method's name, e.g., wp.getUsersBlogs, wp.newPost, etc.
+                *
+                * @since 2.5.0
+                *
+                * @param string $name The method name.
+                */
+               do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
+
+               $blogs = (array) get_blogs_of_user( $user->ID );
+               $struct = array();
+
+               foreach ( $blogs as $blog ) {
+                       // Don't include blogs that aren't hosted at this site.
+                       if ( $blog->site_id != get_current_site()->id )
+                               continue;
+
+                       $blog_id = $blog->userblog_id;
+
+                       switch_to_blog( $blog_id );
+
+                       $is_admin = current_user_can( 'manage_options' );
+
+                       $struct[] = array(
+                               'isAdmin'               => $is_admin,
+                               'url'                   => home_url( '/' ),
+                               'blogid'                => (string) $blog_id,
+                               'blogName'              => get_option( 'blogname' ),
+                               'xmlrpc'                => site_url( 'xmlrpc.php', 'rpc' ),
+                       );
+
+                       restore_current_blog();
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Checks if the method received at least the minimum number of arguments.
+        *
+        * @since 3.4.0
+        * @access protected
+        *
+        * @param string|array $args Sanitize single string or array of strings.
+        * @param int $count         Minimum number of arguments.
+        * @return bool if `$args` contains at least $count arguments.
+        */
+       protected function minimum_args( $args, $count ) {
+               if ( count( $args ) < $count ) {
+                       $this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) );
                        return false;
                }
 
-               wp_set_current_user( $user->ID );
-               return $user;
+               return true;
+       }
+
+       /**
+        * Prepares taxonomy data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param object $taxonomy The unprepared taxonomy data.
+        * @param array $fields    The subset of taxonomy fields to return.
+        * @return array The prepared taxonomy data.
+        */
+       protected function _prepare_taxonomy( $taxonomy, $fields ) {
+               $_taxonomy = array(
+                       'name' => $taxonomy->name,
+                       'label' => $taxonomy->label,
+                       'hierarchical' => (bool) $taxonomy->hierarchical,
+                       'public' => (bool) $taxonomy->public,
+                       'show_ui' => (bool) $taxonomy->show_ui,
+                       '_builtin' => (bool) $taxonomy->_builtin,
+               );
+
+               if ( in_array( 'labels', $fields ) )
+                       $_taxonomy['labels'] = (array) $taxonomy->labels;
+
+               if ( in_array( 'cap', $fields ) )
+                       $_taxonomy['cap'] = (array) $taxonomy->cap;
+
+               if ( in_array( 'menu', $fields ) )
+                       $_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+
+               if ( in_array( 'object_type', $fields ) )
+                       $_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+
+               /**
+                * Filter XML-RPC-prepared data for the given taxonomy.
+                *
+                * @since 3.4.0
+                *
+                * @param array  $_taxonomy An array of taxonomy data.
+                * @param object $taxonomy  Taxonomy object.
+                * @param array  $fields    The subset of taxonomy fields to return.
+                */
+               return apply_filters( 'xmlrpc_prepare_taxonomy', $_taxonomy, $taxonomy, $fields );
+       }
+
+       /**
+        * Prepares term data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param array|object $term The unprepared term data.
+        * @return array The prepared term data.
+        */
+       protected function _prepare_term( $term ) {
+               $_term = $term;
+               if ( ! is_array( $_term ) )
+                       $_term = get_object_vars( $_term );
+
+               // For integers which may be larger than XML-RPC supports ensure we return strings.
+               $_term['term_id'] = strval( $_term['term_id'] );
+               $_term['term_group'] = strval( $_term['term_group'] );
+               $_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
+               $_term['parent'] = strval( $_term['parent'] );
+
+               // Count we are happy to return as an integer because people really shouldn't use terms that much.
+               $_term['count'] = intval( $_term['count'] );
+
+               /**
+                * Filter XML-RPC-prepared data for the given term.
+                *
+                * @since 3.4.0
+                *
+                * @param array        $_term An array of term data.
+                * @param array|object $term  Term object or array.
+                */
+               return apply_filters( 'xmlrpc_prepare_term', $_term, $term );
+       }
+
+       /**
+        * Convert a WordPress date string to an IXR_Date object.
+        *
+        * @access protected
+        *
+        * @param string $date Date string to convert.
+        * @return IXR_Date IXR_Date object.
+        */
+       protected function _convert_date( $date ) {
+               if ( $date === '0000-00-00 00:00:00' ) {
+                       return new IXR_Date( '00000000T00:00:00Z' );
+               }
+               return new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date, false ) );
+       }
+
+       /**
+        * Convert a WordPress GMT date string to an IXR_Date object.
+        *
+        * @access protected
+        *
+        * @param string $date_gmt WordPress GMT date string.
+        * @param string $date     Date string.
+        * @return IXR_Date IXR_Date object.
+        */
+       protected function _convert_date_gmt( $date_gmt, $date ) {
+               if ( $date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00' ) {
+                       return new IXR_Date( get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $date, false ), 'Ymd\TH:i:s' ) );
+               }
+               return $this->_convert_date( $date_gmt );
        }
 
        /**
-        * Sanitize string or array of strings for database.
+        * Prepares post data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param array $post   The unprepared post data.
+        * @param array $fields The subset of post type fields to return.
+        * @return array The prepared post data.
+        */
+       protected function _prepare_post( $post, $fields ) {
+               // Holds the data for this post. built up based on $fields.
+               $_post = array( 'post_id' => strval( $post['ID'] ) );
+
+               // Prepare common post fields.
+               $post_fields = array(
+                       'post_title'        => $post['post_title'],
+                       'post_date'         => $this->_convert_date( $post['post_date'] ),
+                       'post_date_gmt'     => $this->_convert_date_gmt( $post['post_date_gmt'], $post['post_date'] ),
+                       'post_modified'     => $this->_convert_date( $post['post_modified'] ),
+                       'post_modified_gmt' => $this->_convert_date_gmt( $post['post_modified_gmt'], $post['post_modified'] ),
+                       'post_status'       => $post['post_status'],
+                       'post_type'         => $post['post_type'],
+                       'post_name'         => $post['post_name'],
+                       'post_author'       => $post['post_author'],
+                       'post_password'     => $post['post_password'],
+                       'post_excerpt'      => $post['post_excerpt'],
+                       'post_content'      => $post['post_content'],
+                       'post_parent'       => strval( $post['post_parent'] ),
+                       'post_mime_type'    => $post['post_mime_type'],
+                       'link'              => post_permalink( $post['ID'] ),
+                       'guid'              => $post['guid'],
+                       'menu_order'        => intval( $post['menu_order'] ),
+                       'comment_status'    => $post['comment_status'],
+                       'ping_status'       => $post['ping_status'],
+                       'sticky'            => ( $post['post_type'] === 'post' && is_sticky( $post['ID'] ) ),
+               );
+
+               // Thumbnail.
+               $post_fields['post_thumbnail'] = array();
+               $thumbnail_id = get_post_thumbnail_id( $post['ID'] );
+               if ( $thumbnail_id ) {
+                       $thumbnail_size = current_theme_supports('post-thumbnail') ? 'post-thumbnail' : 'thumbnail';
+                       $post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
+               }
+
+               // Consider future posts as published.
+               if ( $post_fields['post_status'] === 'future' )
+                       $post_fields['post_status'] = 'publish';
+
+               // Fill in blank post format.
+               $post_fields['post_format'] = get_post_format( $post['ID'] );
+               if ( empty( $post_fields['post_format'] ) )
+                       $post_fields['post_format'] = 'standard';
+
+               // Merge requested $post_fields fields into $_post.
+               if ( in_array( 'post', $fields ) ) {
+                       $_post = array_merge( $_post, $post_fields );
+               } else {
+                       $requested_fields = array_intersect_key( $post_fields, array_flip( $fields ) );
+                       $_post = array_merge( $_post, $requested_fields );
+               }
+
+               $all_taxonomy_fields = in_array( 'taxonomies', $fields );
+
+               if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
+                       $post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
+                       $terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
+                       $_post['terms'] = array();
+                       foreach ( $terms as $term ) {
+                               $_post['terms'][] = $this->_prepare_term( $term );
+                       }
+               }
+
+               if ( in_array( 'custom_fields', $fields ) )
+                       $_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+
+               if ( in_array( 'enclosure', $fields ) ) {
+                       $_post['enclosure'] = array();
+                       $enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
+                       if ( ! empty( $enclosures ) ) {
+                               $encdata = explode( "\n", $enclosures[0] );
+                               $_post['enclosure']['url'] = trim( htmlspecialchars( $encdata[0] ) );
+                               $_post['enclosure']['length'] = (int) trim( $encdata[1] );
+                               $_post['enclosure']['type'] = trim( $encdata[2] );
+                       }
+               }
+
+               /**
+                * Filter XML-RPC-prepared date for the given post.
+                *
+                * @since 3.4.0
+                *
+                * @param array $_post  An array of modified post data.
+                * @param array $post   An array of post data.
+                * @param array $fields An array of post fields.
+                */
+               return apply_filters( 'xmlrpc_prepare_post', $_post, $post, $fields );
+       }
+
+       /**
+        * Prepares post data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param object $post_type Post type object.
+        * @param array  $fields    The subset of post fields to return.
+        * @return array The prepared post type data.
+        */
+       protected function _prepare_post_type( $post_type, $fields ) {
+               $_post_type = array(
+                       'name' => $post_type->name,
+                       'label' => $post_type->label,
+                       'hierarchical' => (bool) $post_type->hierarchical,
+                       'public' => (bool) $post_type->public,
+                       'show_ui' => (bool) $post_type->show_ui,
+                       '_builtin' => (bool) $post_type->_builtin,
+                       'has_archive' => (bool) $post_type->has_archive,
+                       'supports' => get_all_post_type_supports( $post_type->name ),
+               );
+
+               if ( in_array( 'labels', $fields ) ) {
+                       $_post_type['labels'] = (array) $post_type->labels;
+               }
+
+               if ( in_array( 'cap', $fields ) ) {
+                       $_post_type['cap'] = (array) $post_type->cap;
+                       $_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
+               }
+
+               if ( in_array( 'menu', $fields ) ) {
+                       $_post_type['menu_position'] = (int) $post_type->menu_position;
+                       $_post_type['menu_icon'] = $post_type->menu_icon;
+                       $_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
+               }
+
+               if ( in_array( 'taxonomies', $fields ) )
+                       $_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+
+               /**
+                * Filter XML-RPC-prepared date for the given post type.
+                *
+                * @since 3.4.0
+                *
+                * @param array  $_post_type An array of post type data.
+                * @param object $post_type  Post type object.
+                */
+               return apply_filters( 'xmlrpc_prepare_post_type', $_post_type, $post_type );
+       }
+
+       /**
+        * Prepares media item data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param object $media_item     The unprepared media item data.
+        * @param string $thumbnail_size The image size to use for the thumbnail URL.
+        * @return array The prepared media item data.
+        */
+       protected function _prepare_media_item( $media_item, $thumbnail_size = 'thumbnail' ) {
+               $_media_item = array(
+                       'attachment_id'    => strval( $media_item->ID ),
+                       'date_created_gmt' => $this->_convert_date_gmt( $media_item->post_date_gmt, $media_item->post_date ),
+                       'parent'           => $media_item->post_parent,
+                       'link'             => wp_get_attachment_url( $media_item->ID ),
+                       'title'            => $media_item->post_title,
+                       'caption'          => $media_item->post_excerpt,
+                       'description'      => $media_item->post_content,
+                       'metadata'         => wp_get_attachment_metadata( $media_item->ID ),
+               );
+
+               $thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
+               if ( $thumbnail_src )
+                       $_media_item['thumbnail'] = $thumbnail_src[0];
+               else
+                       $_media_item['thumbnail'] = $_media_item['link'];
+
+               /**
+                * Filter XML-RPC-prepared data for the given media item.
+                *
+                * @since 3.4.0
+                *
+                * @param array  $_media_item    An array of media item data.
+                * @param object $media_item     Media item object.
+                * @param string $thumbnail_size Image size.
+                */
+               return apply_filters( 'xmlrpc_prepare_media_item', $_media_item, $media_item, $thumbnail_size );
+       }
+
+       /**
+        * Prepares page data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param object $page The unprepared page data.
+        * @return array The prepared page data.
+        */
+       protected function _prepare_page( $page ) {
+               // Get all of the page content and link.
+               $full_page = get_extended( $page->post_content );
+               $link = post_permalink( $page->ID );
+
+               // Get info the page parent if there is one.
+               $parent_title = "";
+               if ( ! empty( $page->post_parent ) ) {
+                       $parent = get_post( $page->post_parent );
+                       $parent_title = $parent->post_title;
+               }
+
+               // Determine comment and ping settings.
+               $allow_comments = comments_open( $page->ID ) ? 1 : 0;
+               $allow_pings = pings_open( $page->ID ) ? 1 : 0;
+
+               // Format page date.
+               $page_date = $this->_convert_date( $page->post_date );
+               $page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
+
+               // Pull the categories info together.
+               $categories = array();
+               if ( is_object_in_taxonomy( 'page', 'category' ) ) {
+                       foreach ( wp_get_post_categories( $page->ID ) as $cat_id ) {
+                               $categories[] = get_cat_name( $cat_id );
+                       }
+               }
+
+               // Get the author info.
+               $author = get_userdata( $page->post_author );
+
+               $page_template = get_page_template_slug( $page->ID );
+               if ( empty( $page_template ) )
+                       $page_template = 'default';
+
+               $_page = array(
+                       'dateCreated'            => $page_date,
+                       'userid'                 => $page->post_author,
+                       'page_id'                => $page->ID,
+                       'page_status'            => $page->post_status,
+                       'description'            => $full_page['main'],
+                       'title'                  => $page->post_title,
+                       'link'                   => $link,
+                       'permaLink'              => $link,
+                       'categories'             => $categories,
+                       'excerpt'                => $page->post_excerpt,
+                       'text_more'              => $full_page['extended'],
+                       'mt_allow_comments'      => $allow_comments,
+                       'mt_allow_pings'         => $allow_pings,
+                       'wp_slug'                => $page->post_name,
+                       'wp_password'            => $page->post_password,
+                       'wp_author'              => $author->display_name,
+                       'wp_page_parent_id'      => $page->post_parent,
+                       'wp_page_parent_title'   => $parent_title,
+                       'wp_page_order'          => $page->menu_order,
+                       'wp_author_id'           => (string) $author->ID,
+                       'wp_author_display_name' => $author->display_name,
+                       'date_created_gmt'       => $page_date_gmt,
+                       'custom_fields'          => $this->get_custom_fields( $page->ID ),
+                       'wp_page_template'       => $page_template
+               );
+
+               /**
+                * Filter XML-RPC-prepared data for the given page.
+                *
+                * @since 3.4.0
+                *
+                * @param array   $_page An array of page data.
+                * @param WP_Post $page  Page object.
+                */
+               return apply_filters( 'xmlrpc_prepare_page', $_page, $page );
+       }
+
+       /**
+        * Prepares comment data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param object $comment The unprepared comment data.
+        * @return array The prepared comment data.
+        */
+       protected function _prepare_comment( $comment ) {
+               // Format page date.
+               $comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
+
+               if ( '0' == $comment->comment_approved ) {
+                       $comment_status = 'hold';
+               } elseif ( 'spam' == $comment->comment_approved ) {
+                       $comment_status = 'spam';
+               } elseif ( '1' == $comment->comment_approved ) {
+                       $comment_status = 'approve';
+               } else {
+                       $comment_status = $comment->comment_approved;
+               }
+               $_comment = array(
+                       'date_created_gmt' => $comment_date_gmt,
+                       'user_id'          => $comment->user_id,
+                       'comment_id'       => $comment->comment_ID,
+                       'parent'           => $comment->comment_parent,
+                       'status'           => $comment_status,
+                       'content'          => $comment->comment_content,
+                       'link'             => get_comment_link($comment),
+                       'post_id'          => $comment->comment_post_ID,
+                       'post_title'       => get_the_title($comment->comment_post_ID),
+                       'author'           => $comment->comment_author,
+                       'author_url'       => $comment->comment_author_url,
+                       'author_email'     => $comment->comment_author_email,
+                       'author_ip'        => $comment->comment_author_IP,
+                       'type'             => $comment->comment_type,
+               );
+
+               /**
+                * Filter XML-RPC-prepared data for the given comment.
+                *
+                * @since 3.4.0
+                *
+                * @param array  $_comment An array of prepared comment data.
+                * @param object $comment  Comment object.
+                */
+               return apply_filters( 'xmlrpc_prepare_comment', $_comment, $comment );
+       }
+
+       /**
+        * Prepares user data for return in an XML-RPC object.
+        *
+        * @access protected
+        *
+        * @param WP_User $user   The unprepared user object.
+        * @param array   $fields The subset of user fields to return.
+        * @return array The prepared user data.
+        */
+       protected function _prepare_user( $user, $fields ) {
+               $_user = array( 'user_id' => strval( $user->ID ) );
+
+               $user_fields = array(
+                       'username'          => $user->user_login,
+                       'first_name'        => $user->user_firstname,
+                       'last_name'         => $user->user_lastname,
+                       'registered'        => $this->_convert_date( $user->user_registered ),
+                       'bio'               => $user->user_description,
+                       'email'             => $user->user_email,
+                       'nickname'          => $user->nickname,
+                       'nicename'          => $user->user_nicename,
+                       'url'               => $user->user_url,
+                       'display_name'      => $user->display_name,
+                       'roles'             => $user->roles,
+               );
+
+               if ( in_array( 'all', $fields ) ) {
+                       $_user = array_merge( $_user, $user_fields );
+               } else {
+                       if ( in_array( 'basic', $fields ) ) {
+                               $basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
+                               $fields = array_merge( $fields, $basic_fields );
+                       }
+                       $requested_fields = array_intersect_key( $user_fields, array_flip( $fields ) );
+                       $_user = array_merge( $_user, $requested_fields );
+               }
+
+               /**
+                * Filter XML-RPC-prepared data for the given user.
+                *
+                * @since 3.5.0
+                *
+                * @param array   $_user  An array of user data.
+                * @param WP_User $user   User object.
+                * @param array   $fields An array of user fields.
+                */
+               return apply_filters( 'xmlrpc_prepare_user', $_user, $user, $fields );
+       }
+
+       /**
+        * Create a new post for any registered post type.
+        *
+        * @since 3.4.0
+        *
+        * @link http://en.wikipedia.org/wiki/RSS_enclosure for information on RSS enclosures.
+        *
+        * @param array  $args {
+        *     Method arguments. Note: top-level arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id        Blog ID (unused).
+        *     @type string $username       Username.
+        *     @type string $password       Password.
+        *     @type array  $content_struct {
+        *         Content struct for adding a new post. See wp_insert_post() for information on
+        *         additional post fields
+        *
+        *         @type string $post_type      Post type. Default 'post'.
+        *         @type string $post_status    Post status. Default 'draft'
+        *         @type string $post_title     Post title.
+        *         @type int    $post_author    Post author ID.
+        *         @type string $post_excerpt   Post excerpt.
+        *         @type string $post_content   Post content.
+        *         @type string $post_date_gmt  Post date in GMT.
+        *         @type string $post_date      Post date.
+        *         @type string $post_password  Post password (20-character limit).
+        *         @type string $comment_status Post comment enabled status. Accepts 'open' or 'closed'.
+        *         @type string $ping_status    Post ping status. Accepts 'open' or 'closed'.
+        *         @type bool   $sticky         Whether the post should be sticky. Automatically false if
+        *                                      `$post_status` is 'private'.
+        *         @type int    $post_thumbnail ID of an image to use as the post thumbnail/featured image.
+        *         @type array  $custom_fields  Array of meta key/value pairs to add to the post.
+        *         @type array  $terms          Associative array with taxonomy names as keys and arrays
+        *                                      of term IDs as values.
+        *         @type array  $terms_names    Associative array with taxonomy names as keys and arrays
+        *                                      of term names as values.
+        *         @type array  $enclosure      {
+        *             Array of feed enclosure data to add to post meta.
+        *
+        *             @type string $url    URL for the feed enclosure.
+        *             @type int    $length Size in bytes of the enclosure.
+        *             @type string $type   Mime-type for the enclosure.
+        *         }
+        *     }
+        * }
+        * @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
+        */
+       public function wp_newPost( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $content_struct = $args[3];
+
+               if ( ! $user = $this->login( $username, $password ) )
+                       return $this->error;
+
+               // convert the date field back to IXR form
+               if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
+                       $content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );
+               }
+
+               // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
+               // since _insert_post will ignore the non-GMT date if the GMT date is set
+               if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {
+                       if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
+                               unset( $content_struct['post_date_gmt'] );
+                       } else {
+                               $content_struct['post_date_gmt'] = $this->_convert_date( $content_struct['post_date_gmt'] );
+                       }
+               }
+
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.newPost' );
+
+               unset( $content_struct['ID'] );
+
+               return $this->_insert_post( $user, $content_struct );
+       }
+
+       /**
+        * Helper method for filtering out elements from an array.
+        *
+        * @since 3.4.0
+        *
+        * @param int $count Number to compare to one.
+        */
+       private function _is_greater_than_one( $count ) {
+               return $count > 1;
+       }
+
+       /**
+        * Encapsulate the logic for sticking a post
+        * and determining if the user has permission to do so
+        *
+        * @since 4.3.0
+        * @access private
+        *
+        * @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
+        * @access protected
+        *
+        * @see wp_insert_post()
+        *
+        * @param WP_User         $user           The post author if post_author isn't set in $content_struct.
+        * @param array|IXR_Error $content_struct Post data to insert.
+        * @return IXR_Error|string
+        */
+       protected function _insert_post( $user, $content_struct ) {
+               $defaults = array( 'post_status' => 'draft', 'post_type' => 'post', 'post_author' => 0,
+                       'post_password' => '', 'post_excerpt' => '', 'post_content' => '', 'post_title' => '' );
+
+               $post_data = wp_parse_args( $content_struct, $defaults );
+
+               $post_type = get_post_type_object( $post_data['post_type'] );
+               if ( ! $post_type )
+                       return new IXR_Error( 403, __( 'Invalid post type' ) );
+
+               $update = ! empty( $post_data['ID'] );
+
+               if ( $update ) {
+                       if ( ! get_post( $post_data['ID'] ) )
+                               return new IXR_Error( 401, __( 'Invalid post ID.' ) );
+                       if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
+                               return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+                       if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
+                               return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+               } else {
+                       if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
+                               return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+               }
+
+               switch ( $post_data['post_status'] ) {
+                       case 'draft':
+                       case 'pending':
+                               break;
+                       case 'private':
+                               if ( ! current_user_can( $post_type->cap->publish_posts ) )
+                                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type' ) );
+                               break;
+                       case 'publish':
+                       case 'future':
+                               if ( ! current_user_can( $post_type->cap->publish_posts ) )
+                                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type' ) );
+                               break;
+                       default:
+                               if ( ! get_post_status_object( $post_data['post_status'] ) )
+                                       $post_data['post_status'] = 'draft';
+                       break;
+               }
+
+               if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
+                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type' ) );
+
+               $post_data['post_author'] = absint( $post_data['post_author'] );
+               if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
+                       if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
+                               return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
+
+                       $author = get_userdata( $post_data['post_author'] );
+
+                       if ( ! $author )
+                               return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+               } else {
+                       $post_data['post_author'] = $user->ID;
+               }
+
+               if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' )
+                       unset( $post_data['comment_status'] );
+
+               if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
+                       unset( $post_data['ping_status'] );
+
+               // Do some timestamp voodoo.
+               if ( ! empty( $post_data['post_date_gmt'] ) ) {
+                       // We know this is supposed to be GMT, so we're going to slap that Z on there by force.
+                       $dateCreated = rtrim( $post_data['post_date_gmt']->getIso(), 'Z' ) . 'Z';
+               } elseif ( ! empty( $post_data['post_date'] ) ) {
+                       $dateCreated = $post_data['post_date']->getIso();
+               }
+
+               if ( ! empty( $dateCreated ) ) {
+                       $post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+                       $post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+               }
+
+               if ( ! isset( $post_data['ID'] ) )
+                       $post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+               $post_ID = $post_data['ID'];
+
+               if ( $post_data['post_type'] == 'post' ) {
+                       $error = $this->_toggle_sticky( $post_data, $update );
+                       if ( $error ) {
+                               return $error;
+                       }
+               }
+
+               if ( isset( $post_data['post_thumbnail'] ) ) {
+                       // empty value deletes, non-empty value adds/updates.
+                       if ( ! $post_data['post_thumbnail'] )
+                               delete_post_thumbnail( $post_ID );
+                       elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
+                               return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+                       set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
+                       unset( $content_struct['post_thumbnail'] );
+               }
+
+               if ( isset( $post_data['custom_fields'] ) )
+                       $this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+
+               if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
+                       $post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
+
+                       // Accumulate term IDs from terms and terms_names.
+                       $terms = array();
+
+                       // First validate the terms specified by ID.
+                       if ( isset( $post_data['terms'] ) && is_array( $post_data['terms'] ) ) {
+                               $taxonomies = array_keys( $post_data['terms'] );
+
+                               // Validating term ids.
+                               foreach ( $taxonomies as $taxonomy ) {
+                                       if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+                                               return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+
+                                       if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+                                               return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+
+                                       $term_ids = $post_data['terms'][$taxonomy];
+                                       $terms[ $taxonomy ] = array();
+                                       foreach ( $term_ids as $term_id ) {
+                                               $term = get_term_by( 'id', $term_id, $taxonomy );
+
+                                               if ( ! $term )
+                                                       return new IXR_Error( 403, __( 'Invalid term ID' ) );
+
+                                               $terms[$taxonomy][] = (int) $term_id;
+                                       }
+                               }
+                       }
+
+                       // Now validate terms specified by name.
+                       if ( isset( $post_data['terms_names'] ) && is_array( $post_data['terms_names'] ) ) {
+                               $taxonomies = array_keys( $post_data['terms_names'] );
+
+                               foreach ( $taxonomies as $taxonomy ) {
+                                       if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+                                               return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+
+                                       if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+                                               return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+
+                                       /*
+                                        * For hierarchical taxonomies, we can't assign a term when multiple terms
+                                        * in the hierarchy share the same name.
+                                        */
+                                       $ambiguous_terms = array();
+                                       if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+                                               $tax_term_names = get_terms( $taxonomy, array( 'fields' => 'names', 'hide_empty' => false ) );
+
+                                               // Count the number of terms with the same name.
+                                               $tax_term_names_count = array_count_values( $tax_term_names );
+
+                                               // Filter out non-ambiguous term names.
+                                               $ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one') );
+
+                                               $ambiguous_terms = array_keys( $ambiguous_tax_term_counts );
+                                       }
+
+                                       $term_names = $post_data['terms_names'][$taxonomy];
+                                       foreach ( $term_names as $term_name ) {
+                                               if ( in_array( $term_name, $ambiguous_terms ) )
+                                                       return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+
+                                               $term = get_term_by( 'name', $term_name, $taxonomy );
+
+                                               if ( ! $term ) {
+                                                       // Term doesn't exist, so check that the user is allowed to create new terms.
+                                                       if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
+                                                               return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+
+                                                       // Create the new term.
+                                                       $term_info = wp_insert_term( $term_name, $taxonomy );
+                                                       if ( is_wp_error( $term_info ) )
+                                                               return new IXR_Error( 500, $term_info->get_error_message() );
+
+                                                       $terms[$taxonomy][] = (int) $term_info['term_id'];
+                                               } else {
+                                                       $terms[$taxonomy][] = (int) $term->term_id;
+                                               }
+                                       }
+                               }
+                       }
+
+                       $post_data['tax_input'] = $terms;
+                       unset( $post_data['terms'], $post_data['terms_names'] );
+               } else {
+                       // Do not allow direct submission of 'tax_input', clients must use 'terms' and/or 'terms_names'.
+                       unset( $post_data['tax_input'], $post_data['post_category'], $post_data['tags_input'] );
+               }
+
+               if ( isset( $post_data['post_format'] ) ) {
+                       $format = set_post_format( $post_ID, $post_data['post_format'] );
+
+                       if ( is_wp_error( $format ) )
+                               return new IXR_Error( 500, $format->get_error_message() );
+
+                       unset( $post_data['post_format'] );
+               }
+
+               // Handle enclosures.
+               $enclosure = isset( $post_data['enclosure'] ) ? $post_data['enclosure'] : null;
+               $this->add_enclosure_if_new( $post_ID, $enclosure );
+
+               $this->attach_uploads( $post_ID, $post_data['post_content'] );
+
+               /**
+                * Filter post data array to be inserted via XML-RPC.
+                *
+                * @since 3.4.0
+                *
+                * @param array $post_data      Parsed array of post data.
+                * @param array $content_struct Post data array.
+                */
+               $post_data = apply_filters( 'xmlrpc_wp_insert_post_data', $post_data, $content_struct );
+
+               $post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
+               if ( is_wp_error( $post_ID ) )
+                       return new IXR_Error( 500, $post_ID->get_error_message() );
+
+               if ( ! $post_ID )
+                       return new IXR_Error( 401, __( 'Sorry, your entry could not be posted. Something wrong happened.' ) );
+
+               return strval( $post_ID );
+       }
+
+       /**
+        * Edit a post for any registered post type.
+        *
+        * The $content_struct parameter only needs to contain fields that
+        * should be changed. All other fields will retain their existing values.
+        *
+        * @since 3.4.0
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id        Blog ID (unused).
+        *     @type string $username       Username.
+        *     @type string $password       Password.
+        *     @type int    $post_id        Post ID.
+        *     @type array  $content_struct Extra content arguments.
+        * }
+        * @return true|IXR_Error True on success, IXR_Error on failure.
+        */
+       public function wp_editPost( $args ) {
+               if ( ! $this->minimum_args( $args, 5 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $post_id        = (int) $args[3];
+               $content_struct = $args[4];
+
+               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', 'wp.editPost' );
+
+               $post = get_post( $post_id, ARRAY_A );
+
+               if ( empty( $post['ID'] ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( isset( $content_struct['if_not_modified_since'] ) ) {
+                       // If the post has been modified since the date provided, return an error.
+                       if ( mysql2date( 'U', $post['post_modified_gmt'] ) > $content_struct['if_not_modified_since']->getTimestamp() ) {
+                               return new IXR_Error( 409, __( 'There is a revision of this post that is more recent.' ) );
+                       }
+               }
+
+               // Convert the date field back to IXR form.
+               $post['post_date'] = $this->_convert_date( $post['post_date'] );
+
+               /*
+                * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
+                * since _insert_post() will ignore the non-GMT date if the GMT date is set.
+                */
+               if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
+                       unset( $post['post_date_gmt'] );
+               else
+                       $post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+
+               $this->escape( $post );
+               $merged_content_struct = array_merge( $post, $content_struct );
+
+               $retval = $this->_insert_post( $user, $merged_content_struct );
+               if ( $retval instanceof IXR_Error )
+                       return $retval;
+
+               return true;
+       }
+
+       /**
+        * Delete a post for any registered post type.
+        *
+        * @since 3.4.0
+        *
+        * @see wp_delete_post()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type int    $post_id  Post ID.
+        * }
+        * @return true|IXR_Error True on success, IXR_Error instance on failure.
+        */
+       public function wp_deletePost( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username   = $args[1];
+               $password   = $args[2];
+               $post_id    = (int) $args[3];
+
+               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', 'wp.deletePost' );
+
+               $post = get_post( $post_id, ARRAY_A );
+               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.' ) );
+
+               $result = wp_delete_post( $post_id );
+
+               if ( ! $result )
+                       return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+
+               return true;
+       }
+
+       /**
+        * Retrieve a post.
+        *
+        * @since 3.4.0
+        *
+        * The optional $fields parameter specifies what fields will be included
+        * in the response array. This should be a list of field names. 'post_id' will
+        * always be included in the response regardless of the value of $fields.
+        *
+        * Instead of, or in addition to, individual field names, conceptual group
+        * names can be used to specify multiple fields. The available conceptual
+        * groups are 'post' (all basic fields), 'taxonomies', 'custom_fields',
+        * and 'enclosure'.
+        *
+        * @see get_post()
+        *
+        * @param array $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type int    $post_id  Post ID.
+        *     @type array  $fields   The subset of post type fields to return.
+        * }
+        * @return array|IXR_Error Array contains (based on $fields parameter):
+        *  - 'post_id'
+        *  - 'post_title'
+        *  - 'post_date'
+        *  - 'post_date_gmt'
+        *  - 'post_modified'
+        *  - 'post_modified_gmt'
+        *  - 'post_status'
+        *  - 'post_type'
+        *  - 'post_name'
+        *  - 'post_author'
+        *  - 'post_password'
+        *  - 'post_excerpt'
+        *  - 'post_content'
+        *  - 'link'
+        *  - 'comment_status'
+        *  - 'ping_status'
+        *  - 'sticky'
+        *  - 'custom_fields'
+        *  - 'terms'
+        *  - 'categories'
+        *  - 'tags'
+        *  - 'enclosure'
+        */
+       public function wp_getPost( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $post_id  = (int) $args[3];
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /**
+                        * Filter the list of post query fields used by the given XML-RPC method.
+                        *
+                        * @since 3.4.0
+                        *
+                        * @param array  $fields Array of post fields. Default array contains 'post', 'terms', and 'custom_fields'.
+                        * @param string $method Method name.
+                        */
+                       $fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
+               }
+
+               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', 'wp.getPost' );
+
+               $post = get_post( $post_id, ARRAY_A );
+
+               if ( empty( $post['ID'] ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( ! current_user_can( 'edit_post', $post_id ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+
+               return $this->_prepare_post( $post, $fields );
+       }
+
+       /**
+        * Retrieve posts.
+        *
+        * @since 3.4.0
+        *
+        * @see wp_get_recent_posts()
+        * @see wp_getPost() for more on `$fields`
+        * @see get_posts() for more on `$filter` values
+        *
+        * @param array $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type array  $filter   Optional. Modifies the query used to retrieve posts. Accepts 'post_type',
+        *                            'post_status', 'number', 'offset', 'orderby', and 'order'.
+        *                            Default empty array.
+        *     @type array  $fields   Optional. The subset of post type fields to return in the response array.
+        * }
+        * @return array|IXR_Error Array contains a collection of posts.
+        */
+       public function wp_getPosts( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $filter   = isset( $args[3] ) ? $args[3] : array();
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+                       $fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPosts' );
+               }
+
+               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', 'wp.getPosts' );
+
+               $query = array();
+
+               if ( isset( $filter['post_type'] ) ) {
+                       $post_type = get_post_type_object( $filter['post_type'] );
+                       if ( ! ( (bool) $post_type ) )
+                               return new IXR_Error( 403, __( 'The post type specified is not valid' ) );
+               } else {
+                       $post_type = get_post_type_object( 'post' );
+               }
+
+               if ( ! current_user_can( $post_type->cap->edit_posts ) )
+                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type' ));
+
+               $query['post_type'] = $post_type->name;
+
+               if ( isset( $filter['post_status'] ) )
+                       $query['post_status'] = $filter['post_status'];
+
+               if ( isset( $filter['number'] ) )
+                       $query['numberposts'] = absint( $filter['number'] );
+
+               if ( isset( $filter['offset'] ) )
+                       $query['offset'] = absint( $filter['offset'] );
+
+               if ( isset( $filter['orderby'] ) ) {
+                       $query['orderby'] = $filter['orderby'];
+
+                       if ( isset( $filter['order'] ) )
+                               $query['order'] = $filter['order'];
+               }
+
+               if ( isset( $filter['s'] ) ) {
+                       $query['s'] = $filter['s'];
+               }
+
+               $posts_list = wp_get_recent_posts( $query );
+
+               if ( ! $posts_list )
+                       return array();
+
+               // Holds all the posts data.
+               $struct = array();
+
+               foreach ( $posts_list as $post ) {
+                       if ( ! current_user_can( 'edit_post', $post['ID'] ) )
+                               continue;
+
+                       $struct[] = $this->_prepare_post( $post, $fields );
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Create a new term.
+        *
+        * @since 3.4.0
+        *
+        * @see wp_insert_term()
+        *
+        * @param array $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id        Blog ID (unused).
+        *     @type string $username       Username.
+        *     @type string $password       Password.
+        *     @type array  $content_struct Content struct for adding a new term. The struct must contain
+        *                                  the term 'name' and 'taxonomy'. Optional accepted values include
+        *                                  'parent', 'description', and 'slug'.
+        * }
+        * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
+        */
+       public function wp_newTerm( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $content_struct = $args[3];
+
+               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', 'wp.newTerm' );
+
+               if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
+
+               if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
+
+               $taxonomy = (array) $taxonomy;
+
+               // hold the data of the term
+               $term_data = array();
+
+               $term_data['name'] = trim( $content_struct['name'] );
+               if ( empty( $term_data['name'] ) )
+                       return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+
+               if ( isset( $content_struct['parent'] ) ) {
+                       if ( ! $taxonomy['hierarchical'] )
+                               return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+
+                       $parent_term_id = (int) $content_struct['parent'];
+                       $parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+
+                       if ( is_wp_error( $parent_term ) )
+                               return new IXR_Error( 500, $parent_term->get_error_message() );
+
+                       if ( ! $parent_term )
+                               return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+
+                       $term_data['parent'] = $content_struct['parent'];
+               }
+
+               if ( isset( $content_struct['description'] ) )
+                       $term_data['description'] = $content_struct['description'];
+
+               if ( isset( $content_struct['slug'] ) )
+                       $term_data['slug'] = $content_struct['slug'];
+
+               $term = wp_insert_term( $term_data['name'] , $taxonomy['name'] , $term_data );
+
+               if ( is_wp_error( $term ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $term )
+                       return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
+
+               return strval( $term['term_id'] );
+       }
+
+       /**
+        * Edit a term.
+        *
+        * @since 3.4.0
+        *
+        * @see wp_update_term()
+        *
+        * @param array $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id        Blog ID (unused).
+        *     @type string $username       Username.
+        *     @type string $password       Password.
+        *     @type int    $term_id        Term ID.
+        *     @type array  $content_struct Content struct for editing a term. The struct must contain the
+        *                                  term ''taxonomy'. Optional accepted values include 'name', 'parent',
+        *                                  'description', and 'slug'.
+        * }
+        * @return true|IXR_Error True on success, IXR_Error instance on failure.
+        */
+       public function wp_editTerm( $args ) {
+               if ( ! $this->minimum_args( $args, 5 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $term_id        = (int) $args[3];
+               $content_struct = $args[4];
+
+               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', 'wp.editTerm' );
+
+               if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
+
+               if ( ! current_user_can( $taxonomy->cap->edit_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
+
+               $taxonomy = (array) $taxonomy;
+
+               // hold the data of the term
+               $term_data = array();
+
+               $term = get_term( $term_id , $content_struct['taxonomy'] );
+
+               if ( is_wp_error( $term ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $term )
+                       return new IXR_Error( 404, __( 'Invalid term ID' ) );
+
+               if ( isset( $content_struct['name'] ) ) {
+                       $term_data['name'] = trim( $content_struct['name'] );
+
+                       if ( empty( $term_data['name'] ) )
+                               return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+               }
+
+               if ( isset( $content_struct['parent'] ) ) {
+                       if ( ! $taxonomy['hierarchical'] )
+                               return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+
+                       $parent_term_id = (int) $content_struct['parent'];
+                       $parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+
+                       if ( is_wp_error( $parent_term ) )
+                               return new IXR_Error( 500, $parent_term->get_error_message() );
+
+                       if ( ! $parent_term )
+                               return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+
+                       $term_data['parent'] = $content_struct['parent'];
+               }
+
+               if ( isset( $content_struct['description'] ) )
+                       $term_data['description'] = $content_struct['description'];
+
+               if ( isset( $content_struct['slug'] ) )
+                       $term_data['slug'] = $content_struct['slug'];
+
+               $term = wp_update_term( $term_id , $taxonomy['name'] , $term_data );
+
+               if ( is_wp_error( $term ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $term )
+                       return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+
+               return true;
+       }
+
+       /**
+        * Delete a term.
+        *
+        * @since 3.4.0
+        *
+        * @see wp_delete_term()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id      Blog ID (unused).
+        *     @type string $username     Username.
+        *     @type string $password     Password.
+        *     @type string $taxnomy_name Taxonomy name.
+        *     @type int    $term_id      Term ID.
+        * }
+        * @return bool|IXR_Error True on success, IXR_Error instance on failure.
+        */
+       public function wp_deleteTerm( $args ) {
+               if ( ! $this->minimum_args( $args, 5 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username           = $args[1];
+               $password           = $args[2];
+               $taxonomy           = $args[3];
+               $term_id            = (int) $args[4];
+
+               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', 'wp.deleteTerm' );
+
+               if ( ! taxonomy_exists( $taxonomy ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $taxonomy );
+
+               if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
+
+               $term = get_term( $term_id, $taxonomy->name );
+
+               if ( is_wp_error( $term ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $term )
+                       return new IXR_Error( 404, __( 'Invalid term ID' ) );
+
+               $result = wp_delete_term( $term_id, $taxonomy->name );
+
+               if ( is_wp_error( $result ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $result )
+                       return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+
+               return $result;
+       }
+
+       /**
+        * Retrieve a term.
+        *
+        * @since 3.4.0
+        *
+        * @see get_term()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type string $taxnomy  Taxonomy name.
+        *     @type string $term_id  Term ID.
+        * }
+        * @return array|IXR_Error IXR_Error on failure, array on success, containing:
+        *  - 'term_id'
+        *  - 'name'
+        *  - 'slug'
+        *  - 'term_group'
+        *  - 'term_taxonomy_id'
+        *  - 'taxonomy'
+        *  - 'description'
+        *  - 'parent'
+        *  - 'count'
+        */
+       public function wp_getTerm( $args ) {
+               if ( ! $this->minimum_args( $args, 5 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username           = $args[1];
+               $password           = $args[2];
+               $taxonomy           = $args[3];
+               $term_id            = (int) $args[4];
+
+               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', 'wp.getTerm' );
+
+               if ( ! taxonomy_exists( $taxonomy ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $taxonomy );
+
+               if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+
+               $term = get_term( $term_id , $taxonomy->name, ARRAY_A );
+
+               if ( is_wp_error( $term ) )
+                       return new IXR_Error( 500, $term->get_error_message() );
+
+               if ( ! $term )
+                       return new IXR_Error( 404, __( 'Invalid term ID' ) );
+
+               return $this->_prepare_term( $term );
+       }
+
+       /**
+        * Retrieve all terms for a taxonomy.
+        *
+        * @since 3.4.0
+        *
+        * The optional $filter parameter modifies the query used to retrieve terms.
+        * Accepted keys are 'number', 'offset', 'orderby', 'order', 'hide_empty', and 'search'.
+        *
+        * @see get_terms()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type string $taxnomy  Taxonomy name.
+        *     @type array  $filter   Optional. Modifies the query used to retrieve posts. Accepts 'number',
+        *                            'offset', 'orderby', 'order', 'hide_empty', and 'search'. Default empty array.
+        * }
+        * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
+        */
+       public function wp_getTerms( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $taxonomy       = $args[3];
+               $filter         = isset( $args[4] ) ? $args[4] : array();
+
+               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', 'wp.getTerms' );
+
+               if ( ! taxonomy_exists( $taxonomy ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $taxonomy );
+
+               if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+
+               $query = array();
+
+               if ( isset( $filter['number'] ) )
+                       $query['number'] = absint( $filter['number'] );
+
+               if ( isset( $filter['offset'] ) )
+                       $query['offset'] = absint( $filter['offset'] );
+
+               if ( isset( $filter['orderby'] ) ) {
+                       $query['orderby'] = $filter['orderby'];
+
+                       if ( isset( $filter['order'] ) )
+                               $query['order'] = $filter['order'];
+               }
+
+               if ( isset( $filter['hide_empty'] ) )
+                       $query['hide_empty'] = $filter['hide_empty'];
+               else
+                       $query['get'] = 'all';
+
+               if ( isset( $filter['search'] ) )
+                       $query['search'] = $filter['search'];
+
+               $terms = get_terms( $taxonomy->name, $query );
+
+               if ( is_wp_error( $terms ) )
+                       return new IXR_Error( 500, $terms->get_error_message() );
+
+               $struct = array();
+
+               foreach ( $terms as $term ) {
+                       $struct[] = $this->_prepare_term( $term );
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Retrieve a taxonomy.
+        *
+        * @since 3.4.0
+        *
+        * @see get_taxonomy()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type string $taxnomy  Taxonomy name.
+        *     @type array  $fields   Optional. Array of taxonomy fields to limit to in the return.
+        *                            Accepts 'labels', 'cap', 'menu', and 'object_type'.
+        *                            Default empty array.
+        * }
+        * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
+        */
+       public function wp_getTaxonomy( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $taxonomy = $args[3];
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /**
+                        * Filter the taxonomy query fields used by the given XML-RPC method.
+                        *
+                        * @since 3.4.0
+                        *
+                        * @param array  $fields An array of taxonomy fields to retrieve.
+                        * @param string $method The method name.
+                        */
+                       $fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
+               }
+
+               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', 'wp.getTaxonomy' );
+
+               if ( ! taxonomy_exists( $taxonomy ) )
+                       return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
+
+               $taxonomy = get_taxonomy( $taxonomy );
+
+               if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+                       return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
+
+               return $this->_prepare_taxonomy( $taxonomy, $fields );
+       }
+
+       /**
+        * Retrieve all taxonomies.
+        *
+        * @since 3.4.0
+        *
+        * @see get_taxonomies()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id  Blog ID (unused).
+        *     @type string $username Username.
+        *     @type string $password Password.
+        *     @type array  $filter   Optional. An array of arguments for retrieving taxonomies.
+        *     @type array  $fields   Optional. The subset of taxonomy fields to return.
+        * }
+        * @return array|IXR_Error An associative array of taxonomy data with returned fields determined
+        *                         by `$fields`, or an IXR_Error instance on failure.
+        */
+       public function wp_getTaxonomies( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+                       $fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomies' );
+               }
+
+               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', 'wp.getTaxonomies' );
+
+               $taxonomies = get_taxonomies( $filter, 'objects' );
+
+               // holds all the taxonomy data
+               $struct = array();
+
+               foreach ( $taxonomies as $taxonomy ) {
+                       // capability check for post_types
+                       if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+                               continue;
+
+                       $struct[] = $this->_prepare_taxonomy( $taxonomy, $fields );
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Retrieve a user.
+        *
+        * The optional $fields parameter specifies what fields will be included
+        * in the response array. This should be a list of field names. 'user_id' will
+        * always be included in the response regardless of the value of $fields.
+        *
+        * Instead of, or in addition to, individual field names, conceptual group
+        * names can be used to specify multiple fields. The available conceptual
+        * groups are 'basic' and 'all'.
+        *
+        * @uses get_userdata()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $user_id
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error Array contains (based on $fields parameter):
+        *  - 'user_id'
+        *  - 'username'
+        *  - 'first_name'
+        *  - 'last_name'
+        *  - 'registered'
+        *  - 'bio'
+        *  - 'email'
+        *  - 'nickname'
+        *  - 'nicename'
+        *  - 'url'
+        *  - 'display_name'
+        *  - 'roles'
+        */
+       public function wp_getUser( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $user_id  = (int) $args[3];
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /**
+                        * Filter the default user query fields used by the given XML-RPC method.
+                        *
+                        * @since 3.5.0
+                        *
+                        * @param array  $fields User query fields for given method. Default 'all'.
+                        * @param string $method The method name.
+                        */
+                       $fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
+               }
+
+               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', 'wp.getUser' );
+
+               if ( ! current_user_can( 'edit_user', $user_id ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit users.' ) );
+
+               $user_data = get_userdata( $user_id );
+
+               if ( ! $user_data )
+                       return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+
+               return $this->_prepare_user( $user_data, $fields );
+       }
+
+       /**
+        * Retrieve users.
+        *
+        * The optional $filter parameter modifies the query used to retrieve users.
+        * Accepted keys are 'number' (default: 50), 'offset' (default: 0), 'role',
+        * 'who', 'orderby', and 'order'.
+        *
+        * The optional $fields parameter specifies what fields will be included
+        * in the response array.
+        *
+        * @uses get_users()
+        * @see wp_getUser() for more on $fields and return values
         *
-        * @since 1.5.2
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
         *
-        * @param string|array $array Sanitize single string or array of strings.
-        * @return string|array Type matches $array and sanitized for the database.
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $filter (optional)
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error users data
         */
-       function escape(&$array) {
-               global $wpdb;
+       public function wp_getUsers( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $filter   = isset( $args[3] ) ? $args[3] : array();
 
-               if (!is_array($array)) {
-                       return($wpdb->escape($array));
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
                } else {
-                       foreach ( (array) $array as $k => $v ) {
-                               if ( is_array($v) ) {
-                                       $this->escape($array[$k]);
-                               } else if ( is_object($v) ) {
-                                       //skip
-                               } else {
-                                       $array[$k] = $wpdb->escape($v);
-                               }
-                       }
+                       /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+                       $fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUsers' );
                }
-       }
 
-       /**
-        * Retrieve custom fields for post.
-        *
-        * @since 2.5.0
-        *
-        * @param int $post_id Post ID.
-        * @return array Custom fields, if exist.
-        */
-       function get_custom_fields($post_id) {
-               $post_id = (int) $post_id;
+               if ( ! $user = $this->login( $username, $password ) )
+                       return $this->error;
 
-               $custom_fields = array();
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getUsers' );
 
-               foreach ( (array) has_meta($post_id) as $meta ) {
-                       // Don't expose protected fields.
-                       if ( strpos($meta['meta_key'], '_wp_') === 0 ) {
-                               continue;
-                       }
+               if ( ! current_user_can( 'list_users' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
 
-                       $custom_fields[] = array(
-                               "id"    => $meta['meta_id'],
-                               "key"   => $meta['meta_key'],
-                               "value" => $meta['meta_value']
-                       );
+               $query = array( 'fields' => 'all_with_meta' );
+
+               $query['number'] = ( isset( $filter['number'] ) ) ? absint( $filter['number'] ) : 50;
+               $query['offset'] = ( isset( $filter['offset'] ) ) ? absint( $filter['offset'] ) : 0;
+
+               if ( isset( $filter['orderby'] ) ) {
+                       $query['orderby'] = $filter['orderby'];
+
+                       if ( isset( $filter['order'] ) )
+                               $query['order'] = $filter['order'];
                }
 
-               return $custom_fields;
-       }
+               if ( isset( $filter['role'] ) ) {
+                       if ( get_role( $filter['role'] ) === null )
+                               return new IXR_Error( 403, __( 'The role specified is not valid' ) );
 
-       /**
-        * Set custom fields for post.
-        *
-        * @since 2.5.0
-        *
-        * @param int $post_id Post ID.
-        * @param array $fields Custom fields.
-        */
-       function set_custom_fields($post_id, $fields) {
-               $post_id = (int) $post_id;
+                       $query['role'] = $filter['role'];
+               }
 
-               foreach ( (array) $fields as $meta ) {
-                       if ( isset($meta['id']) ) {
-                               $meta['id'] = (int) $meta['id'];
+               if ( isset( $filter['who'] ) ) {
+                       $query['who'] = $filter['who'];
+               }
 
-                               if ( isset($meta['key']) ) {
-                                       update_meta($meta['id'], $meta['key'], $meta['value']);
-                               }
-                               else {
-                                       delete_meta($meta['id']);
-                               }
-                       }
-                       else {
-                               $_POST['metakeyinput'] = $meta['key'];
-                               $_POST['metavalue'] = $meta['value'];
-                               add_meta($post_id);
-                       }
+               $users = get_users( $query );
+
+               $_users = array();
+               foreach ( $users as $user_data ) {
+                       if ( current_user_can( 'edit_user', $user_data->ID ) )
+                               $_users[] = $this->_prepare_user( $user_data, $fields );
                }
+               return $_users;
        }
 
        /**
-        * Set up blog options property.
+        * Retrieve information about the requesting user.
         *
-        * Passes property through 'xmlrpc_blog_options' filter.
+        * @uses get_userdata()
         *
-        * @since 2.6.0
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error (@see wp_getUser)
         */
-       function initialise_blog_option_info( ) {
-               global $wp_version;
+       public function wp_getProfile( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
 
-               $this->blog_options = array(
-                       // Read only options
-                       'software_name'         => array(
-                               'desc'                  => __( 'Software Name' ),
-                               'readonly'              => true,
-                               'value'                 => 'WordPress'
-                       ),
-                       'software_version'      => array(
-                               'desc'                  => __( 'Software Version' ),
-                               'readonly'              => true,
-                               'value'                 => $wp_version
-                       ),
-                       'blog_url'                      => array(
-                               'desc'                  => __( 'Site URL' ),
-                               'readonly'              => true,
-                               'option'                => 'siteurl'
-                       ),
+               $this->escape( $args );
 
-                       // Updatable options
-                       'time_zone'                     => array(
-                               'desc'                  => __( 'Time Zone' ),
-                               'readonly'              => false,
-                               'option'                => 'gmt_offset'
-                       ),
-                       'blog_title'            => array(
-                               'desc'                  => __( 'Site Title' ),
-                               'readonly'              => false,
-                               'option'                        => 'blogname'
-                       ),
-                       'blog_tagline'          => array(
-                               'desc'                  => __( 'Site Tagline' ),
-                               'readonly'              => false,
-                               'option'                => 'blogdescription'
-                       ),
-                       'date_format'           => array(
-                               'desc'                  => __( 'Date Format' ),
-                               'readonly'              => false,
-                               'option'                => 'date_format'
-                       ),
-                       'time_format'           => array(
-                               'desc'                  => __( 'Time Format' ),
-                               'readonly'              => false,
-                               'option'                => 'time_format'
-                       ),
-                       'users_can_register'    => array(
-                               'desc'                  => __( 'Allow new users to sign up' ),
-                               'readonly'              => false,
-                               'option'                => 'users_can_register'
-                       ),
-                       'thumbnail_size_w'      => array(
-                               'desc'                  => __( 'Thumbnail Width' ),
-                               'readonly'              => false,
-                               'option'                => 'thumbnail_size_w'
-                       ),
-                       'thumbnail_size_h'      => array(
-                               'desc'                  => __( 'Thumbnail Height' ),
-                               'readonly'              => false,
-                               'option'                => 'thumbnail_size_h'
-                       ),
-                       'thumbnail_crop'        => array(
-                               'desc'                  => __( 'Crop thumbnail to exact dimensions' ),
-                               'readonly'              => false,
-                               'option'                => 'thumbnail_crop'
-                       ),
-                       'medium_size_w' => array(
-                               'desc'                  => __( 'Medium size image width' ),
-                               'readonly'              => false,
-                               'option'                => 'medium_size_w'
-                       ),
-                       'medium_size_h' => array(
-                               'desc'                  => __( 'Medium size image height' ),
-                               'readonly'              => false,
-                               'option'                => 'medium_size_h'
-                       ),
-                       'large_size_w'  => array(
-                               'desc'                  => __( 'Large size image width' ),
-                               'readonly'              => false,
-                               'option'                => 'large_size_w'
-                       ),
-                       'large_size_h'  => array(
-                               'desc'                  => __( 'Large size image height' ),
-                               'readonly'              => false,
-                               'option'                => 'large_size_h'
-                       )
-               );
+               $username = $args[1];
+               $password = $args[2];
 
-               $this->blog_options = apply_filters( 'xmlrpc_blog_options', $this->blog_options );
+               if ( isset( $args[3] ) ) {
+                       $fields = $args[3];
+               } else {
+                       /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+                       $fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getProfile' );
+               }
+
+               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', 'wp.getProfile' );
+
+               if ( ! current_user_can( 'edit_user', $user->ID ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+
+               $user_data = get_userdata( $user->ID );
+
+               return $this->_prepare_user( $user_data, $fields );
        }
 
        /**
-        * Retrieve the blogs of the user.
-        *
-        * @since 2.6.0
-        *
-        * @param array $args Method parameters. Contains:
-        *  - username
-        *  - password
-        * @return array. Contains:
-        *  - 'isAdmin'
-        *  - 'url'
-        *  - 'blogid'
-        *  - 'blogName'
-        *  - 'xmlrpc' - url of xmlrpc endpoint
+        * Edit user's profile.
+        *
+        * @uses wp_update_user()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $content_struct It can optionally contain:
+        *      - 'first_name'
+        *      - 'last_name'
+        *      - 'website'
+        *      - 'display_name'
+        *      - 'nickname'
+        *      - 'nicename'
+        *      - 'bio'
+        * }
+        * @return true|IXR_Error True, on success.
         */
-       function wp_getUsersBlogs( $args ) {
-               global $current_site;
-               // If this isn't on WPMU then just use blogger_getUsersBlogs
-               if ( !is_multisite() ) {
-                       array_unshift( $args, 1 );
-                       return $this->blogger_getUsersBlogs( $args );
-               }
+       public function wp_editProfile( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
 
                $this->escape( $args );
 
-               $username = $args[0];
-               $password = $args[1];
+               $username       = $args[1];
+               $password       = $args[2];
+               $content_struct = $args[3];
 
-               if ( !$user = $this->login($username, $password) )
+               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', 'wp.editProfile' );
 
-               do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
+               if ( ! current_user_can( 'edit_user', $user->ID ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
 
-               $blogs = (array) get_blogs_of_user( $user->ID );
-               $struct = array( );
+               // holds data of the user
+               $user_data = array();
+               $user_data['ID'] = $user->ID;
 
-               foreach ( $blogs as $blog ) {
-                       // Don't include blogs that aren't hosted at this site
-                       if ( $blog->site_id != $current_site->id )
-                               continue;
+               // only set the user details if it was given
+               if ( isset( $content_struct['first_name'] ) )
+                       $user_data['first_name'] = $content_struct['first_name'];
 
-                       $blog_id = $blog->userblog_id;
-                       switch_to_blog($blog_id);
-                       $is_admin = current_user_can('manage_options');
+               if ( isset( $content_struct['last_name'] ) )
+                       $user_data['last_name'] = $content_struct['last_name'];
 
-                       $struct[] = array(
-                               'isAdmin'               => $is_admin,
-                               'url'                   => get_option( 'home' ) . '/',
-                               'blogid'                => (string) $blog_id,
-                               'blogName'              => get_option( 'blogname' ),
-                               'xmlrpc'                => site_url( 'xmlrpc.php' )
-                       );
+               if ( isset( $content_struct['url'] ) )
+                       $user_data['user_url'] = $content_struct['url'];
 
-                       restore_current_blog( );
-               }
+               if ( isset( $content_struct['display_name'] ) )
+                       $user_data['display_name'] = $content_struct['display_name'];
 
-               return $struct;
+               if ( isset( $content_struct['nickname'] ) )
+                       $user_data['nickname'] = $content_struct['nickname'];
+
+               if ( isset( $content_struct['nicename'] ) )
+                       $user_data['user_nicename'] = $content_struct['nicename'];
+
+               if ( isset( $content_struct['bio'] ) )
+                       $user_data['description'] = $content_struct['bio'];
+
+               $result = wp_update_user( $user_data );
+
+               if ( is_wp_error( $result ) )
+                       return new IXR_Error( 500, $result->get_error_message() );
+
+               if ( ! $result )
+                       return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+
+               return true;
        }
 
        /**
@@ -442,103 +2575,44 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - page_id
-        *  - username
-        *  - password
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $page_id
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPage($args) {
-               $this->escape($args);
+       public function wp_getPage( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $page_id        = (int) $args[1];
-               $username       = $args[2];
-               $password       = $args[3];
+               $page_id  = (int) $args[1];
+               $username = $args[2];
+               $password = $args[3];
 
                if ( !$user = $this->login($username, $password) ) {
                        return $this->error;
                }
 
+               $page = get_post($page_id);
+               if ( ! $page )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
                if ( !current_user_can( 'edit_page', $page_id ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit this page.' ) );
 
-               do_action('xmlrpc_call', 'wp.getPage');
-
-               // Lookup page info.
-               $page = get_page($page_id);
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getPage' );
 
                // If we found the page then format the data.
                if ( $page->ID && ($page->post_type == 'page') ) {
-                       // Get all of the page content and link.
-                       $full_page = get_extended($page->post_content);
-                       $link = post_permalink($page->ID);
-
-                       // Get info the page parent if there is one.
-                       $parent_title = "";
-                       if ( !empty($page->post_parent) ) {
-                               $parent = get_page($page->post_parent);
-                               $parent_title = $parent->post_title;
-                       }
-
-                       // Determine comment and ping settings.
-                       $allow_comments = comments_open($page->ID) ? 1 : 0;
-                       $allow_pings = pings_open($page->ID) ? 1 : 0;
-
-                       // Format page date.
-                       $page_date = mysql2date('Ymd\TH:i:s', $page->post_date, false);
-                       $page_date_gmt = mysql2date('Ymd\TH:i:s', $page->post_date_gmt, false);
-
-                       // For drafts use the GMT version of the date
-                       if ( $page->post_status == 'draft' )
-                               $page_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $page->post_date ), 'Ymd\TH:i:s' );
-
-                       // Pull the categories info together.
-                       $categories = array();
-                       foreach ( wp_get_post_categories($page->ID) as $cat_id ) {
-                               $categories[] = get_cat_name($cat_id);
-                       }
-
-                       // Get the author info.
-                       $author = get_userdata($page->post_author);
-
-                       $page_template = get_post_meta( $page->ID, '_wp_page_template', true );
-                       if ( empty( $page_template ) )
-                               $page_template = 'default';
-
-                       $page_struct = array(
-                               'dateCreated'                   => new IXR_Date($page_date),
-                               'userid'                                => $page->post_author,
-                               'page_id'                               => $page->ID,
-                               'page_status'                   => $page->post_status,
-                               'description'                   => $full_page['main'],
-                               'title'                                 => $page->post_title,
-                               'link'                                  => $link,
-                               'permaLink'                             => $link,
-                               'categories'                    => $categories,
-                               'excerpt'                               => $page->post_excerpt,
-                               'text_more'                             => $full_page['extended'],
-                               'mt_allow_comments'             => $allow_comments,
-                               'mt_allow_pings'                => $allow_pings,
-                               'wp_slug'                               => $page->post_name,
-                               'wp_password'                   => $page->post_password,
-                               'wp_author'                             => $author->display_name,
-                               'wp_page_parent_id'             => $page->post_parent,
-                               'wp_page_parent_title'  => $parent_title,
-                               'wp_page_order'                 => $page->menu_order,
-                               'wp_author_id'                  => $author->ID,
-                               'wp_author_display_name'        => $author->display_name,
-                               'date_created_gmt'              => new IXR_Date($page_date_gmt),
-                               'custom_fields'                 => $this->get_custom_fields($page_id),
-                               'wp_page_template'              => $page_template
-                       );
-
-                       return($page_struct);
+                       return $this->_prepare_page( $page );
                }
                // If the page doesn't exist indicate that.
                else {
-                       return(new IXR_Error(404, __('Sorry, no such page.')));
+                       return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
                }
        }
 
@@ -547,20 +2621,22 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - num_pages
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $num_pages
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPages($args) {
-               $this->escape($args);
+       public function wp_getPages( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
-               $num_pages      = isset($args[3]) ? (int) $args[3] : 10;
+               $username  = $args[1];
+               $password  = $args[2];
+               $num_pages = isset($args[3]) ? (int) $args[3] : 10;
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -568,7 +2644,8 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_pages' ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
 
-               do_action('xmlrpc_call', 'wp.getPages');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getPages' );
 
                $pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
                $num_pages = count($pages);
@@ -577,19 +2654,15 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( $num_pages >= 1 ) {
                        $pages_struct = array();
 
-                       for ( $i = 0; $i < $num_pages; $i++ ) {
-                               $page = wp_xmlrpc_server::wp_getPage(array(
-                                       $blog_id, $pages[$i]->ID, $username, $password
-                               ));
-                               $pages_struct[] = $page;
+                       foreach ($pages as $page) {
+                               if ( current_user_can( 'edit_page', $page->ID ) )
+                                       $pages_struct[] = $this->_prepare_page( $page );
                        }
 
-                       return($pages_struct);
-               }
-               // If no pages were found return an error.
-               else {
-                       return(array());
+                       return $pages_struct;
                }
+
+               return array();
        }
 
        /**
@@ -597,30 +2670,34 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters. See {@link wp_xmlrpc_server::mw_newPost()}
-        * @return unknown
+        * @see wp_xmlrpc_server::mw_newPost()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $content_struct
+        * }
+        * @return int|IXR_Error
         */
-       function wp_newPage($args) {
+       public function wp_newPage( $args ) {
                // Items not escaped here will be escaped in newPost.
-               $username       = $this->escape($args[1]);
-               $password       = $this->escape($args[2]);
-               $page           = $args[3];
-               $publish        = $args[4];
+               $username = $this->escape( $args[1] );
+               $password = $this->escape( $args[2] );
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'wp.newPage');
-
-               // Make sure the user is allowed to add new pages.
-               if ( !current_user_can('publish_pages') )
-                       return(new IXR_Error(401, __('Sorry, you cannot add new pages.')));
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.newPage' );
 
                // Mark this as content for a page.
                $args[3]["post_type"] = 'page';
 
                // Let mw_newPost do all of the heavy lifting.
-               return($this->mw_newPost($args));
+               return $this->mw_newPost( $args );
        }
 
        /**
@@ -628,38 +2705,55 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return bool True, if success.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $page_id
+        * }
+        * @return true|IXR_Error True, if success.
         */
-       function wp_deletePage($args) {
-               $this->escape($args);
+       public function wp_deletePage( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
-               $page_id        = (int) $args[3];
+               $username = $args[1];
+               $password = $args[2];
+               $page_id  = (int) $args[3];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'wp.deletePage');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.deletePage' );
 
                // Get the current page based on the page_id and
                // make sure it is a page and not a post.
-               $actual_page = wp_get_single_post($page_id, ARRAY_A);
+               $actual_page = get_post($page_id, ARRAY_A);
                if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-                       return(new IXR_Error(404, __('Sorry, no such page.')));
+                       return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
 
                // Make sure the user can delete pages.
                if ( !current_user_can('delete_page', $page_id) )
-                       return(new IXR_Error(401, __('Sorry, you do not have the right to delete this page.')));
+                       return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
 
                // Attempt to delete the page.
                $result = wp_delete_post($page_id);
                if ( !$result )
-                       return(new IXR_Error(500, __('Failed to delete the page.')));
+                       return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+
+               /**
+                * Fires after a page has been successfully deleted via XML-RPC.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $page_id ID of the deleted page.
+                * @param array $args    An array of arguments to delete the page.
+                */
+               do_action( 'xmlrpc_call_success_wp_deletePage', $page_id, $args );
 
-               return(true);
+               return true;
        }
 
        /**
@@ -667,31 +2761,44 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return unknown
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $page_id
+        *     @type string $username
+        *     @type string $password
+        *     @type string $content
+        *     @type string $publish
+        * }
+        * @return array|IXR_Error
         */
-       function wp_editPage($args) {
-               // Items not escaped here will be escaped in editPost.
-               $blog_id        = (int) $args[0];
-               $page_id        = (int) $this->escape($args[1]);
-               $username       = $this->escape($args[2]);
-               $password       = $this->escape($args[3]);
-               $content        = $args[4];
-               $publish        = $args[5];
+       public function wp_editPage( $args ) {
+               // Items will be escaped in mw_editPost.
+               $page_id  = (int) $args[1];
+               $username = $args[2];
+               $password = $args[3];
+               $content  = $args[4];
+               $publish  = $args[5];
 
-               if ( !$user = $this->login($username, $password) )
+               $escaped_username = $this->escape( $username );
+               $escaped_password = $this->escape( $password );
+
+               if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
                        return $this->error;
+               }
 
-               do_action('xmlrpc_call', 'wp.editPage');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.editPage' );
 
                // Get the page data and make sure it is a page.
-               $actual_page = wp_get_single_post($page_id, ARRAY_A);
+               $actual_page = get_post($page_id, ARRAY_A);
                if ( !$actual_page || ($actual_page['post_type'] != 'page') )
-                       return(new IXR_Error(404, __('Sorry, no such page.')));
+                       return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
 
                // Make sure the user is allowed to edit pages.
                if ( !current_user_can('edit_page', $page_id) )
-                       return(new IXR_Error(401, __('Sorry, you do not have the right to edit this page.')));
+                       return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
 
                // Mark this as content for a page.
                $content['post_type'] = 'page';
@@ -706,7 +2813,7 @@ class wp_xmlrpc_server extends IXR_Server {
                );
 
                // Let mw_editPost do all of the heavy lifting.
-               return($this->mw_editPost($args));
+               return $this->mw_editPost( $args );
        }
 
        /**
@@ -714,17 +2821,24 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return unknown
+        * @global wpdb $wpdb
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPageList($args) {
+       public function wp_getPageList( $args ) {
                global $wpdb;
 
-               $this->escape($args);
+               $this->escape( $args );
 
-               $blog_id                                = (int) $args[0];
-               $username                               = $args[1];
-               $password                               = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -732,7 +2846,8 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_pages' ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
 
-               do_action('xmlrpc_call', 'wp.getPageList');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getPageList' );
 
                // Get list of pages ids and titles
                $page_list = $wpdb->get_results("
@@ -747,27 +2862,18 @@ class wp_xmlrpc_server extends IXR_Server {
                        ORDER BY ID
                ");
 
-               // The date needs to be formated properly.
+               // The date needs to be formatted properly.
                $num_pages = count($page_list);
                for ( $i = 0; $i < $num_pages; $i++ ) {
-                       $post_date = mysql2date('Ymd\TH:i:s', $page_list[$i]->post_date, false);
-                       $post_date_gmt = mysql2date('Ymd\TH:i:s', $page_list[$i]->post_date_gmt, false);
-
-                       $page_list[$i]->dateCreated = new IXR_Date($post_date);
-                       $page_list[$i]->date_created_gmt = new IXR_Date($post_date_gmt);
-
-                       // For drafts use the GMT version of the date
-                       if ( $page_list[$i]->post_status == 'draft' ) {
-                               $page_list[$i]->date_created_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $page_list[$i]->post_date ), 'Ymd\TH:i:s' );
-                               $page_list[$i]->date_created_gmt = new IXR_Date( $page_list[$i]->date_created_gmt );
-                       }
+                       $page_list[$i]->dateCreated = $this->_convert_date(  $page_list[$i]->post_date );
+                       $page_list[$i]->date_created_gmt = $this->_convert_date_gmt( $page_list[$i]->post_date_gmt, $page_list[$i]->post_date );
 
                        unset($page_list[$i]->post_date_gmt);
                        unset($page_list[$i]->post_date);
                        unset($page_list[$i]->post_status);
                }
 
-               return($page_list);
+               return $page_list;
        }
 
        /**
@@ -775,24 +2881,29 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getAuthors($args) {
-
-               $this->escape($args);
+       public function wp_getAuthors( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
                if ( !current_user_can('edit_posts') )
-                       return(new IXR_Error(401, __('Sorry, you cannot edit posts on this site.')));
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.getAuthors');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getAuthors' );
 
                $authors = array();
                foreach ( get_users( array( 'fields' => array('ID','user_login','display_name') ) ) as $user ) {
@@ -809,17 +2920,22 @@ class wp_xmlrpc_server extends IXR_Server {
        /**
         * Get list of all tags
         *
-        * @since 2.7
+        * @since 2.7.0
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
         *
-        * @param array $args Method parameters.
-        * @return array
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getTags( $args ) {
+       public function wp_getTags( $args ) {
                $this->escape( $args );
 
-               $blog_id                = (int) $args[0];
-               $username               = $args[1];
-               $password               = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -827,12 +2943,14 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_posts' ) )
                        return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
 
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
                do_action( 'xmlrpc_call', 'wp.getKeywords' );
 
-               $tags = array( );
+               $tags = array();
 
                if ( $all_tags = get_tags() ) {
                        foreach( (array) $all_tags as $tag ) {
+                               $struct = array();
                                $struct['tag_id']                       = $tag->term_id;
                                $struct['name']                         = $tag->name;
                                $struct['count']                        = $tag->count;
@@ -852,25 +2970,32 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return int Category ID.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $category
+        * }
+        * @return int|IXR_Error Category ID.
         */
-       function wp_newCategory($args) {
-               $this->escape($args);
+       public function wp_newCategory( $args ) {
+               $this->escape( $args );
 
-               $blog_id                                = (int) $args[0];
-               $username                               = $args[1];
-               $password                               = $args[2];
-               $category                               = $args[3];
+               $username = $args[1];
+               $password = $args[2];
+               $category = $args[3];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'wp.newCategory');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.newCategory' );
 
                // Make sure the user is allowed to add a category.
                if ( !current_user_can('manage_categories') )
-                       return(new IXR_Error(401, __('Sorry, you do not have the right to add a category.')));
+                       return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
 
                // If no slug was provided make it empty so that
                // WordPress will generate one.
@@ -898,12 +3023,22 @@ class wp_xmlrpc_server extends IXR_Server {
                        if ( 'term_exists' == $cat_id->get_error_code() )
                                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 new category failed.'));
                } elseif ( ! $cat_id ) {
-                       return(new IXR_Error(500, __('Sorry, the new category failed.')));
+                       return new IXR_Error(500, __('Sorry, the new category failed.'));
                }
 
-               return($cat_id);
+               /**
+                * Fires after a new category has been successfully created via XML-RPC.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $cat_id ID of the new category.
+                * @param array $args   An array of new category arguments.
+                */
+               do_action( 'xmlrpc_call_success_wp_newCategory', $cat_id, $args );
+
+               return $cat_id;
        }
 
        /**
@@ -911,26 +3046,47 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.5.0
         *
-        * @param array $args Method parameters.
-        * @return mixed See {@link wp_delete_term()} for return info.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $category_id
+        * }
+        * @return bool|IXR_Error See {@link wp_delete_term()} for return info.
         */
-       function wp_deleteCategory($args) {
-               $this->escape($args);
+       public function wp_deleteCategory( $args ) {
+               $this->escape( $args );
 
-               $blog_id                = (int) $args[0];
-               $username               = $args[1];
-               $password               = $args[2];
-               $category_id    = (int) $args[3];
+               $username    = $args[1];
+               $password    = $args[2];
+               $category_id = (int) $args[3];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'wp.deleteCategory');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.deleteCategory' );
 
                if ( !current_user_can('manage_categories') )
                        return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
 
-               return wp_delete_term( $category_id, 'category' );
+               $status = wp_delete_term( $category_id, 'category' );
+
+               if ( true == $status ) {
+                       /**
+                        * Fires after a category has been successfully deleted via XML-RPC.
+                        *
+                        * @since 3.4.0
+                        *
+                        * @param int   $category_id ID of the deleted category.
+                        * @param array $args        An array of arguments to delete the category.
+                        */
+                       do_action( 'xmlrpc_call_success_wp_deleteCategory', $category_id, $args );
+               }
+
+               return $status;
        }
 
        /**
@@ -938,25 +3094,33 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.2.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $category
+        *     @type int    $max_results
+        * }
+        * @return array|IXR_Error
         */
-       function wp_suggestCategories($args) {
-               $this->escape($args);
+       public function wp_suggestCategories( $args ) {
+               $this->escape( $args );
 
-               $blog_id                                = (int) $args[0];
-               $username                               = $args[1];
-               $password                               = $args[2];
-               $category                               = $args[3];
-               $max_results                    = (int) $args[4];
+               $username    = $args[1];
+               $password    = $args[2];
+               $category    = $args[3];
+               $max_results = (int) $args[4];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
                if ( !current_user_can( 'edit_posts' ) )
-                       return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) );
+                       return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
 
-               do_action('xmlrpc_call', 'wp.suggestCategories');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.suggestCategories' );
 
                $category_suggestions = array();
                $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
@@ -967,7 +3131,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        );
                }
 
-               return($category_suggestions);
+               return $category_suggestions;
        }
 
        /**
@@ -975,13 +3139,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.7.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $comment_id
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getComment($args) {
+       public function wp_getComment($args) {
                $this->escape($args);
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $comment_id     = (int) $args[3];
@@ -992,50 +3162,19 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'moderate_comments' ) )
                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.getComment');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getComment' );
 
                if ( ! $comment = get_comment($comment_id) )
                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 
-               // Format page date.
-               $comment_date = mysql2date('Ymd\TH:i:s', $comment->comment_date, false);
-               $comment_date_gmt = mysql2date('Ymd\TH:i:s', $comment->comment_date_gmt, false);
-
-               if ( '0' == $comment->comment_approved )
-                       $comment_status = 'hold';
-               else if ( 'spam' == $comment->comment_approved )
-                       $comment_status = 'spam';
-               else if ( '1' == $comment->comment_approved )
-                       $comment_status = 'approve';
-               else
-                       $comment_status = $comment->comment_approved;
-
-               $link = get_comment_link($comment);
-
-               $comment_struct = array(
-                       'date_created_gmt'              => new IXR_Date($comment_date_gmt),
-                       'user_id'                               => $comment->user_id,
-                       'comment_id'                    => $comment->comment_ID,
-                       'parent'                                => $comment->comment_parent,
-                       'status'                                => $comment_status,
-                       'content'                               => $comment->comment_content,
-                       'link'                                  => $link,
-                       'post_id'                               => $comment->comment_post_ID,
-                       'post_title'                    => get_the_title($comment->comment_post_ID),
-                       'author'                                => $comment->comment_author,
-                       'author_url'                    => $comment->comment_author_url,
-                       'author_email'                  => $comment->comment_author_email,
-                       'author_ip'                             => $comment->comment_author_IP,
-                       'type'                                  => $comment->comment_type,
-               );
-
-               return $comment_struct;
+               return $this->_prepare_comment( $comment );
        }
 
        /**
         * Retrieve comments.
         *
-        * Besides the common blog_id, username, and password arguments, it takes a filter
+        * Besides the common blog_id (unused), username, and password arguments, it takes a filter
         * array as last argument.
         *
         * Accepted 'filter' keys are 'status', 'post_id', 'offset', and 'number'.
@@ -1048,17 +3187,22 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.7.0
         *
-        * @param array $args Method parameters.
-        * @return array. Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $struct
+        * }
+        * @return array|IXR_Error Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
         */
-       function wp_getComments($args) {
-               $raw_args = $args;
-               $this->escape($args);
+       public function wp_getComments( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
-               $struct         = $args[3];
+               $username = $args[1];
+               $password = $args[2];
+               $struct   = isset( $args[3] ) ? $args[3] : array();
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1066,7 +3210,8 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'moderate_comments' ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
 
-               do_action('xmlrpc_call', 'wp.getComments');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getComments' );
 
                if ( isset($struct['status']) )
                        $status = $struct['status'];
@@ -1085,20 +3230,13 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( isset($struct['number']) )
                        $number = absint($struct['number']);
 
-               $comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
-               $num_comments = count($comments);
-
-               if ( ! $num_comments )
-                       return array();
+               $comments = get_comments( array( 'status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
 
                $comments_struct = array();
-
-    // FIXME: we already have the comments, why query them again?
-               for ( $i = 0; $i < $num_comments; $i++ ) {
-                       $comment = wp_xmlrpc_server::wp_getComment(array(
-                               $raw_args[0], $raw_args[1], $raw_args[2], $comments[$i]->comment_ID,
-                       ));
-                       $comments_struct[] = $comment;
+               if ( is_array( $comments ) ) {
+                       foreach ( $comments as $comment ) {
+                               $comments_struct[] = $this->_prepare_comment( $comment );
+                       }
                }
 
                return $comments_struct;
@@ -1113,17 +3251,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.7.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - comment_id
-        * @return mixed {@link wp_delete_comment()}
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $comment_ID
+        * }
+        * @return bool|IXR_Error {@link wp_delete_comment()}
         */
-       function wp_deleteComment($args) {
+       public function wp_deleteComment($args) {
                $this->escape($args);
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $comment_ID     = (int) $args[3];
@@ -1134,21 +3274,36 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'moderate_comments' ) )
                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
+               if ( ! get_comment($comment_ID) )
+                       return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
                if ( !current_user_can( 'edit_comment', $comment_ID ) )
                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.deleteComment');
-
-               if ( ! get_comment($comment_ID) )
-                       return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.deleteComment' );
+
+               $status = wp_delete_comment( $comment_ID );
+
+               if ( $status ) {
+                       /**
+                        * Fires after a comment has been successfully deleted via XML-RPC.
+                        *
+                        * @since 3.4.0
+                        *
+                        * @param int   $comment_ID ID of the deleted comment.
+                        * @param array $args       An array of arguments to delete the comment.
+                        */
+                       do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_ID, $args );
+               }
 
-               return wp_delete_comment($comment_ID);
+               return $status;
        }
 
        /**
         * Edit comment.
         *
-        * Besides the common blog_id, username, and password arguments, it takes a
+        * Besides the common blog_id (unused), username, and password arguments, it takes a
         * comment_id integer and a content_struct array as last argument.
         *
         * The allowed keys in the content_struct array are:
@@ -1157,22 +3312,24 @@ class wp_xmlrpc_server extends IXR_Server {
         *  - 'author_email'
         *  - 'content'
         *  - 'date_created_gmt'
-        *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See {@link get_comment_statuses()} for more details
+        *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See get_comment_statuses() for more details
         *
         * @since 2.7.0
         *
-        * @param array $args. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - comment_id
-        *  - content_struct
-        * @return bool True, on success.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $comment_ID
+        *     @type array  $content_struct
+        * }
+        * @return true|IXR_Error True, on success.
         */
-       function wp_editComment($args) {
-               $this->escape($args);
+       public function wp_editComment( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $comment_ID     = (int) $args[3];
@@ -1184,13 +3341,14 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'moderate_comments' ) )
                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
+               if ( ! get_comment($comment_ID) )
+                       return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
                if ( !current_user_can( 'edit_comment', $comment_ID ) )
                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.editComment');
-
-               if ( ! get_comment($comment_ID) )
-                       return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.editComment' );
 
                if ( isset($content_struct['status']) ) {
                        $statuses = get_comment_statuses();
@@ -1203,7 +3361,8 @@ class wp_xmlrpc_server extends IXR_Server {
 
                // Do some timestamp voodoo
                if ( !empty( $content_struct['date_created_gmt'] ) ) {
-                       $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                       // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                       $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
                        $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
                        $comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
                }
@@ -1230,6 +3389,16 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !$result )
                        return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
 
+               /**
+                * Fires after a comment has been successfully updated via XML-RPC.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $comment_ID ID of the updated comment.
+                * @param array $args       An array of arguments to update the comment.
+                */
+               do_action( 'xmlrpc_call_success_wp_editComment', $comment_ID, $args );
+
                return true;
        }
 
@@ -1238,30 +3407,44 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.7.0
         *
-        * @param array $args Method parameters.
-        * @return mixed {@link wp_new_comment()}
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int        $blog_id (unused)
+        *     @type string     $username
+        *     @type string     $password
+        *     @type string|int $post
+        *     @type array      $content_struct
+        * }
+        * @return int|IXR_Error {@link wp_new_comment()}
         */
-       function wp_newComment($args) {
-               global $wpdb;
-
+       public function wp_newComment($args) {
                $this->escape($args);
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
-               $post           = $args[3];
+               $username       = $args[1];
+               $password       = $args[2];
+               $post           = $args[3];
                $content_struct = $args[4];
 
-               $allow_anon = apply_filters('xmlrpc_allow_anonymous_comments', false);
+               /**
+                * Filter whether to allow anonymous comments over XML-RPC.
+                *
+                * @since 2.7.0
+                *
+                * @param bool $allow Whether to allow anonymous commenting via XML-RPC.
+                *                    Default false.
+                */
+               $allow_anon = apply_filters( 'xmlrpc_allow_anonymous_comments', false );
 
                $user = $this->login($username, $password);
 
                if ( !$user ) {
                        $logged_in = false;
-                       if ( $allow_anon && get_option('comment_registration') )
+                       if ( $allow_anon && get_option('comment_registration') ) {
                                return new IXR_Error( 403, __( 'You must be registered to comment' ) );
-                       else if ( !$allow_anon )
+                       } elseif ( ! $allow_anon ) {
                                return $this->error;
+                       }
                } else {
                        $logged_in = true;
                }
@@ -1277,12 +3460,13 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( ! get_post($post_id) )
                        return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
+               $comment = array();
                $comment['comment_post_ID'] = $post_id;
 
                if ( $logged_in ) {
-                       $comment['comment_author'] = $wpdb->escape( $user->display_name );
-                       $comment['comment_author_email'] = $wpdb->escape( $user->user_email );
-                       $comment['comment_author_url'] = $wpdb->escape( $user->user_url );
+                       $comment['comment_author'] = $this->escape( $user->display_name );
+                       $comment['comment_author_email'] = $this->escape( $user->user_email );
+                       $comment['comment_author_url'] = $this->escape( $user->user_url );
                        $comment['user_ID'] = $user->ID;
                } else {
                        $comment['comment_author'] = '';
@@ -1311,9 +3495,22 @@ class wp_xmlrpc_server extends IXR_Server {
 
                $comment['comment_content'] =  isset($content_struct['content']) ? $content_struct['content'] : null;
 
-               do_action('xmlrpc_call', 'wp.newComment');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.newComment' );
+
+               $comment_ID = wp_new_comment( $comment );
+
+               /**
+                * Fires after a new comment has been successfully created via XML-RPC.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $comment_ID ID of the new comment.
+                * @param array $args       An array of new comment arguments.
+                */
+               do_action( 'xmlrpc_call_success_wp_newComment', $comment_ID, $args );
 
-               return wp_new_comment($comment);
+               return $comment_ID;
        }
 
        /**
@@ -1321,15 +3518,20 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.7.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getCommentStatusList($args) {
+       public function wp_getCommentStatusList($args) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1337,9 +3539,10 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'moderate_comments' ) )
                        return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.getCommentStatusList');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getCommentStatusList' );
 
-               return get_comment_statuses( );
+               return get_comment_statuses();
        }
 
        /**
@@ -1347,13 +3550,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $post_id
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getCommentCount( $args ) {
-               $this->escape($args);
+       public function wp_getCommentCount( $args ) {
+               $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $post_id        = (int) $args[3];
@@ -1364,7 +3573,8 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_posts' ) )
                        return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) );
 
-               do_action('xmlrpc_call', 'wp.getCommentCount');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getCommentCount' );
 
                $count = wp_count_comments( $post_id );
                return array(
@@ -1380,15 +3590,20 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPostStatusList( $args ) {
+       public function wp_getPostStatusList( $args ) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1396,9 +3611,10 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_posts' ) )
                        return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.getPostStatusList');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
 
-               return get_post_statuses( );
+               return get_post_statuses();
        }
 
        /**
@@ -1406,15 +3622,20 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPageStatusList( $args ) {
+       public function wp_getPageStatusList( $args ) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1422,9 +3643,10 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_pages' ) )
                        return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
 
-               do_action('xmlrpc_call', 'wp.getPageStatusList');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
 
-               return get_page_statuses( );
+               return get_page_statuses();
        }
 
        /**
@@ -1432,15 +3654,20 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.6.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getPageTemplates( $args ) {
+       public function wp_getPageTemplates( $args ) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
-               $username       = $args[1];
-               $password       = $args[2];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1448,7 +3675,7 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_pages' ) )
                        return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
 
-               $templates = get_page_templates( );
+               $templates = get_page_templates();
                $templates['Default'] = 'default';
 
                return $templates;
@@ -1459,13 +3686,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.6.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $options
+        * }
+        * @return array|IXR_Error
         */
-       function wp_getOptions( $args ) {
+       public function wp_getOptions( $args ) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $options        = isset( $args[3] ) ? (array) $args[3] : array();
@@ -1488,8 +3721,9 @@ class wp_xmlrpc_server extends IXR_Server {
         * @param array $options Options to retrieve.
         * @return array
         */
-       function _getOptions($options) {
-               $data = array( );
+       public function _getOptions($options) {
+               $data = array();
+               $can_manage = current_user_can( 'manage_options' );
                foreach ( $options as $option ) {
                        if ( array_key_exists( $option, $this->blog_options ) ) {
                                $data[$option] = $this->blog_options[$option];
@@ -1498,6 +3732,9 @@ class wp_xmlrpc_server extends IXR_Server {
                                        $data[$option]['value'] = get_option( $data[$option]['option'] );
                                        unset($data[$option]['option']);
                                }
+
+                               if ( ! $can_manage )
+                                       $data[$option]['readonly'] = true;
                        }
                }
 
@@ -1509,13 +3746,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.6.0
         *
-        * @param array $args Method parameters.
-        * @return unknown
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $options
+        * }
+        * @return array|IXR_Error
         */
-       function wp_setOptions( $args ) {
+       public function wp_setOptions( $args ) {
                $this->escape( $args );
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $options        = (array) $args[3];
@@ -1526,6 +3769,7 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'manage_options' ) )
                        return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
 
+               $option_names = array();
                foreach ( $options as $o_name => $o_value ) {
                        $option_names[] = $o_name;
                        if ( !array_key_exists( $o_name, $this->blog_options ) )
@@ -1534,7 +3778,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        if ( $this->blog_options[$o_name]['readonly'] == true )
                                continue;
 
-                       update_option( $this->blog_options[$o_name]['option'], $o_value );
+                       update_option( $this->blog_options[$o_name]['option'], wp_unslash( $o_value ) );
                }
 
                //Now return the updated values
@@ -1546,12 +3790,15 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 3.1.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - attachment_id
-        * @return array. Assocciative array containing:
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $attachment_id
+        * }
+        * @return array|IXR_Error Associative array contains:
         *  - 'date_created_gmt'
         *  - 'parent'
         *  - 'link'
@@ -1561,10 +3808,9 @@ class wp_xmlrpc_server extends IXR_Server {
         *  - 'description'
         *  - 'metadata'
         */
-       function wp_getMediaItem($args) {
-               $this->escape($args);
+       public function wp_getMediaItem( $args ) {
+               $this->escape( $args );
 
-               $blog_id                = (int) $args[0];
                $username               = $args[1];
                $password               = $args[2];
                $attachment_id  = (int) $args[3];
@@ -1573,62 +3819,46 @@ class wp_xmlrpc_server extends IXR_Server {
                        return $this->error;
 
                if ( !current_user_can( 'upload_files' ) )
-                       return new IXR_Error( 403, __( 'You are not allowed to upload files to this site.' ) );
+                       return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
 
-               do_action('xmlrpc_call', 'wp.getMediaItem');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getMediaItem' );
 
                if ( ! $attachment = get_post($attachment_id) )
                        return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
 
-               // Format page date.
-               $attachment_date = mysql2date('Ymd\TH:i:s', $attachment->post_date, false);
-               $attachment_date_gmt = mysql2date('Ymd\TH:i:s', $attachment->post_date_gmt, false);
-
-               $link = wp_get_attachment_url($attachment->ID);
-               $thumbnail_link = wp_get_attachment_thumb_url($attachment->ID);
-
-               $attachment_struct = array(
-                       'date_created_gmt'              => new IXR_Date($attachment_date_gmt),
-                       'parent'                                => $attachment->post_parent,
-                       'link'                                  => $link,
-                       'thumbnail'                             => $thumbnail_link,
-                       'title'                                 => $attachment->post_title,
-                       'caption'                               => $attachment->post_excerpt,
-                       'description'                   => $attachment->post_content,
-                       'metadata'                              => wp_get_attachment_metadata($attachment->ID),
-               );
-
-               return $attachment_struct;
+               return $this->_prepare_media_item( $attachment );
        }
 
        /**
         * Retrieves a collection of media library items (or attachments)
         *
-        * Besides the common blog_id, username, and password arguments, it takes a filter
+        * Besides the common blog_id (unused), username, and password arguments, it takes a filter
         * array as last argument.
         *
         * Accepted 'filter' keys are 'parent_id', 'mime_type', 'offset', and 'number'.
         *
         * The defaults are as follows:
         * - 'number' - Default is 5. Total number of media items to retrieve.
-        * - 'offset' - Default is 0. See {@link WP_Query::query()} for more.
+        * - 'offset' - Default is 0. See WP_Query::query() for more.
         * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
         * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
         *
         * @since 3.1.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - filter
-        * @return array. Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $struct
+        * }
+        * @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
         */
-       function wp_getMediaLibrary($args) {
-               $raw_args = $args;
+       public function wp_getMediaLibrary($args) {
                $this->escape($args);
 
-               $blog_id        = (int) $args[0];
                $username       = $args[1];
                $password       = $args[2];
                $struct         = isset( $args[3] ) ? $args[3] : array() ;
@@ -1637,9 +3867,10 @@ class wp_xmlrpc_server extends IXR_Server {
                        return $this->error;
 
                if ( !current_user_can( 'upload_files' ) )
-                       return new IXR_Error( 401, __( 'Sorry, you cannot upload files.' ) );
+                       return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
 
-               do_action('xmlrpc_call', 'wp.getMediaLibrary');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'wp.getMediaLibrary' );
 
                $parent_id = ( isset($struct['parent_id']) ) ? absint($struct['parent_id']) : '' ;
                $mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : '' ;
@@ -1647,50 +3878,53 @@ class wp_xmlrpc_server extends IXR_Server {
                $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
 
                $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
-               $num_attachments = count($attachments);
-
-               if ( ! $num_attachments )
-                       return array();
 
                $attachments_struct = array();
 
                foreach ($attachments as $attachment )
-                       $attachments_struct[] = $this->wp_getMediaItem( array( $raw_args[0], $raw_args[1], $raw_args[2], $attachment->ID ) );
+                       $attachments_struct[] = $this->_prepare_media_item( $attachment );
 
                return $attachments_struct;
        }
 
        /**
-         * Retrives a list of post formats used by the site
-         *
-         * @since 3.1
-         *
-         * @param array $args Method parameters. Contains:
-         *  - blog_id
-         *  - username
-         *  - password
-         * @return array
-         */
-       function wp_getPostFormats( $args ) {
+        * Retrieves a list of post formats used by the site.
+        *
+        * @since 3.1.0
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error List of post formats, otherwise IXR_Error object.
+        */
+       public function wp_getPostFormats( $args ) {
                $this->escape( $args );
 
-               $blog_id = (int) $args[0];
                $username = $args[1];
                $password = $args[2];
 
                if ( !$user = $this->login( $username, $password ) )
                        return $this->error;
 
+               if ( !current_user_can( 'edit_posts' ) )
+                       return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
                do_action( 'xmlrpc_call', 'wp.getPostFormats' );
 
                $formats = get_post_format_strings();
 
-               # find out if they want a list of currently supports formats
+               // find out if they want a list of currently supports formats
                if ( isset( $args[3] ) && is_array( $args[3] ) ) {
                        if ( $args[3]['show-supported'] ) {
                                if ( current_theme_supports( 'post-formats' ) ) {
                                        $supported = get_theme_support( 'post-formats' );
 
+                                       $data = array();
                                        $data['all'] = $formats;
                                        $data['supported'] = $supported[0];
 
@@ -1702,6 +3936,266 @@ class wp_xmlrpc_server extends IXR_Server {
                return $formats;
        }
 
+       /**
+        * Retrieves a post type
+        *
+        * @since 3.4.0
+        *
+        * @see get_post_type_object()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type string $post_type_name
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error Array contains:
+        *  - 'labels'
+        *  - 'description'
+        *  - 'capability_type'
+        *  - 'cap'
+        *  - 'map_meta_cap'
+        *  - 'hierarchical'
+        *  - 'menu_position'
+        *  - 'taxonomies'
+        *  - 'supports'
+        */
+       public function wp_getPostType( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username       = $args[1];
+               $password       = $args[2];
+               $post_type_name = $args[3];
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /**
+                        * Filter the default query fields used by the given XML-RPC method.
+                        *
+                        * @since 3.4.0
+                        *
+                        * @param array  $fields An array of post type query fields for the given method.
+                        * @param string $method The method name.
+                        */
+                       $fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
+               }
+
+               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', 'wp.getPostType' );
+
+               if ( ! post_type_exists( $post_type_name ) )
+                       return new IXR_Error( 403, __( 'Invalid post type' ) );
+
+               $post_type = get_post_type_object( $post_type_name );
+
+               if ( ! current_user_can( $post_type->cap->edit_posts ) )
+                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
+
+               return $this->_prepare_post_type( $post_type, $fields );
+       }
+
+       /**
+        * Retrieves a post types
+        *
+        * @since 3.4.0
+        *
+        * @see get_post_types()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $filter (optional)
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error
+        */
+       public function wp_getPostTypes( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+                       $fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostTypes' );
+               }
+
+               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', 'wp.getPostTypes' );
+
+               $post_types = get_post_types( $filter, 'objects' );
+
+               $struct = array();
+
+               foreach( $post_types as $post_type ) {
+                       if ( ! current_user_can( $post_type->cap->edit_posts ) )
+                               continue;
+
+                       $struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Retrieve revisions for a specific post.
+        *
+        * @since 3.5.0
+        *
+        * The optional $fields parameter specifies what fields will be included
+        * in the response array.
+        *
+        * @uses wp_get_post_revisions()
+        * @see wp_getPost() for more on $fields
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $post_id
+        *     @type array  $fields (optional)
+        * }
+        * @return array|IXR_Error contains a collection of posts.
+        */
+       public function wp_getRevisions( $args ) {
+               if ( ! $this->minimum_args( $args, 4 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username = $args[1];
+               $password = $args[2];
+               $post_id  = (int) $args[3];
+
+               if ( isset( $args[4] ) ) {
+                       $fields = $args[4];
+               } else {
+                       /**
+                        * Filter the default revision query fields used by the given XML-RPC method.
+                        *
+                        * @since 3.5.0
+                        *
+                        * @param array  $field  An array of revision query fields.
+                        * @param string $method The method name.
+                        */
+                       $fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
+               }
+
+               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', 'wp.getRevisions' );
+
+               if ( ! $post = get_post( $post_id ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( ! current_user_can( 'edit_post', $post_id ) )
+                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+
+               // Check if revisions are enabled.
+               if ( ! wp_revisions_enabled( $post ) )
+                       return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+
+               $revisions = wp_get_post_revisions( $post_id );
+
+               if ( ! $revisions )
+                       return array();
+
+               $struct = array();
+
+               foreach ( $revisions as $revision ) {
+                       if ( ! current_user_can( 'read_post', $revision->ID ) )
+                               continue;
+
+                       // Skip autosaves
+                       if ( wp_is_post_autosave( $revision ) )
+                               continue;
+
+                       $struct[] = $this->_prepare_post( get_object_vars( $revision ), $fields );
+               }
+
+               return $struct;
+       }
+
+       /**
+        * Restore a post revision
+        *
+        * @since 3.5.0
+        *
+        * @uses wp_restore_post_revision()
+        *
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $revision_id
+        * }
+        * @return bool|IXR_Error false if there was an error restoring, true if success.
+        */
+       public function wp_restoreRevision( $args ) {
+               if ( ! $this->minimum_args( $args, 3 ) )
+                       return $this->error;
+
+               $this->escape( $args );
+
+               $username    = $args[1];
+               $password    = $args[2];
+               $revision_id = (int) $args[3];
+
+               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', 'wp.restoreRevision' );
+
+               if ( ! $revision = wp_get_post_revision( $revision_id ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( wp_is_post_autosave( $revision ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( ! $post = get_post( $revision->post_parent ) )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
+               if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+
+               // Check if revisions are disabled.
+               if ( ! wp_revisions_enabled( $post ) )
+                       return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+
+               $post = wp_restore_post_revision( $revision_id );
+
+               return (bool) $post;
+       }
+
        /* Blogger API functions.
         * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/
         */
@@ -1713,22 +4207,29 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function blogger_getUsersBlogs($args) {
+       public function blogger_getUsersBlogs($args) {
                if ( is_multisite() )
                        return $this->_multisite_getUsersBlogs($args);
 
                $this->escape($args);
 
                $username = $args[1];
-               $password  = $args[2];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'blogger.getUsersBlogs');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
 
                $is_admin = current_user_can('manage_options');
 
@@ -1737,7 +4238,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        'url'      => get_option('home') . '/',
                        'blogid'   => '1',
                        'blogName' => get_option('blogname'),
-                       'xmlrpc'   => site_url( 'xmlrpc.php' )
+                       'xmlrpc'   => site_url( 'xmlrpc.php', 'rpc' ),
                );
 
                return array($struct);
@@ -1747,14 +4248,16 @@ class wp_xmlrpc_server extends IXR_Server {
         * Private function for retrieving a users blogs for multisite setups
         *
         * @access protected
+        *
+        * @return array|IXR_Error
         */
-       function _multisite_getUsersBlogs($args) {
-               global $current_blog;
+       protected function _multisite_getUsersBlogs($args) {
+               $current_blog = get_blog_details();
+
                $domain = $current_blog->domain;
                $path = $current_blog->path . 'xmlrpc.php';
-               $protocol = is_ssl() ? 'https' : 'http';
 
-               $rpc = new IXR_Client("$protocol://{$domain}{$path}");
+               $rpc = new IXR_Client( set_url_scheme( "http://{$domain}{$path}" ) );
                $rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
                $blogs = $rpc->getResponse();
 
@@ -1779,15 +4282,20 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function blogger_getUserInfo($args) {
-
-               $this->escape($args);
+       public function blogger_getUserInfo( $args ) {
+               $this->escape( $args );
 
                $username = $args[1];
-               $password  = $args[2];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
@@ -1795,7 +4303,8 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !current_user_can( 'edit_posts' ) )
                        return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
 
-               do_action('xmlrpc_call', 'blogger.getUserInfo');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
 
                $struct = array(
                        'nickname'  => $user->nickname,
@@ -1813,36 +4322,45 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $post_ID
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function blogger_getPost($args) {
-
-               $this->escape($args);
+       public function blogger_getPost( $args ) {
+               $this->escape( $args );
 
-               $post_ID    = (int) $args[1];
+               $post_ID  = (int) $args[1];
                $username = $args[2];
-               $password  = $args[3];
+               $password = $args[3];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
+               $post_data = get_post($post_ID, ARRAY_A);
+               if ( ! $post_data )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
                if ( !current_user_can( 'edit_post', $post_ID ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
 
-               do_action('xmlrpc_call', 'blogger.getPost');
-
-               $post_data = wp_get_single_post($post_ID, ARRAY_A);
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.getPost' );
 
                $categories = implode(',', wp_get_post_categories($post_ID));
 
-               $content  = '<title>'.stripslashes($post_data['post_title']).'</title>';
+               $content  = '<title>'.wp_unslash($post_data['post_title']).'</title>';
                $content .= '<category>'.$categories.'</category>';
-               $content .= stripslashes($post_data['post_content']);
+               $content .= wp_unslash($post_data['post_content']);
 
                $struct = array(
                        'userid'    => $post_data['post_author'],
-                       'dateCreated' => new IXR_Date(mysql2date('Ymd\TH:i:s', $post_data['post_date'], false)),
+                       'dateCreated' => $this->_convert_date( $post_data['post_date'] ),
                        'content'     => $content,
                        'postid'  => (string) $post_data['ID']
                );
@@ -1855,17 +4373,24 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type string $appkey (unused)
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type int    $numberposts (optional)
+        * }
+        * @return array|IXR_Error
         */
-       function blogger_getRecentPosts($args) {
+       public function blogger_getRecentPosts( $args ) {
 
                $this->escape($args);
 
                // $args[0] = appkey - ignored
-               $blog_ID    = (int) $args[1]; /* though we don't use it yet */
                $username = $args[2];
-               $password  = $args[3];
+               $password = $args[3];
                if ( isset( $args[4] ) )
                        $query = array( 'numberposts' => absint( $args[4] ) );
                else
@@ -1874,7 +4399,11 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'blogger.getRecentPosts');
+               if ( ! current_user_can( 'edit_posts' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you cannot edit posts on this site.' ) );
+
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.getRecentPosts' );
 
                $posts_list = wp_get_recent_posts( $query );
 
@@ -1883,111 +4412,49 @@ class wp_xmlrpc_server extends IXR_Server {
                        return $this->error;
                }
 
+               $recent_posts = array();
                foreach ($posts_list as $entry) {
                        if ( !current_user_can( 'edit_post', $entry['ID'] ) )
                                continue;
 
-                       $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date'], false);
+                       $post_date  = $this->_convert_date( $entry['post_date'] );
                        $categories = implode(',', wp_get_post_categories($entry['ID']));
 
-                       $content  = '<title>'.stripslashes($entry['post_title']).'</title>';
+                       $content  = '<title>'.wp_unslash($entry['post_title']).'</title>';
                        $content .= '<category>'.$categories.'</category>';
-                       $content .= stripslashes($entry['post_content']);
+                       $content .= wp_unslash($entry['post_content']);
 
-                       $struct[] = array(
+                       $recent_posts[] = array(
                                'userid' => $entry['post_author'],
-                               'dateCreated' => new IXR_Date($post_date),
+                               'dateCreated' => $post_date,
                                'content' => $content,
                                'postid' => (string) $entry['ID'],
                        );
-
-               }
-
-               $recent_posts = array();
-               for ( $j=0; $j<count($struct); $j++ ) {
-                       array_push($recent_posts, $struct[$j]);
                }
 
                return $recent_posts;
        }
 
        /**
-        * Retrieve blog_filename content.
+        * Deprecated.
         *
         * @since 1.5.0
-        *
-        * @param array $args Method parameters.
-        * @return string
+        * @deprecated 3.5.0
+        * @return IXR_Error
         */
-       function blogger_getTemplate($args) {
-
-               $this->escape($args);
-
-               $blog_ID    = (int) $args[1];
-               $username = $args[2];
-               $password  = $args[3];
-               $template   = $args[4]; /* could be 'main' or 'archiveIndex', but we don't use it */
-
-               if ( !$user = $this->login($username, $password) )
-                       return $this->error;
-
-               do_action('xmlrpc_call', 'blogger.getTemplate');
-
-               if ( !current_user_can('edit_themes') )
-                       return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
-
-               /* warning: here we make the assumption that the blog's URL is on the same server */
-               $filename = get_option('home') . '/';
-               $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
-
-               $f = fopen($filename, 'r');
-               $content = fread($f, filesize($filename));
-               fclose($f);
-
-               /* so it is actually editable with a windows/mac client */
-               // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented.     $content = str_replace("\n", "\r\n", $content);
-
-               return $content;
+       public function blogger_getTemplate($args) {
+               return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
        }
 
        /**
-        * Updates the content of blog_filename.
+        * Deprecated.
         *
         * @since 1.5.0
-        *
-        * @param array $args Method parameters.
-        * @return bool True when done.
+        * @deprecated 3.5.0
+        * @return IXR_Error
         */
-       function blogger_setTemplate($args) {
-
-               $this->escape($args);
-
-               $blog_ID    = (int) $args[1];
-               $username = $args[2];
-               $password  = $args[3];
-               $content    = $args[4];
-               $template   = $args[5]; /* could be 'main' or 'archiveIndex', but we don't use it */
-
-               if ( !$user = $this->login($username, $password) )
-                       return $this->error;
-
-               do_action('xmlrpc_call', 'blogger.setTemplate');
-
-               if ( !current_user_can('edit_themes') )
-                       return new IXR_Error(401, __('Sorry, this user cannot edit the template.'));
-
-               /* warning: here we make the assumption that the blog's URL is on the same server */
-               $filename = get_option('home') . '/';
-               $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
-
-               if ($f = fopen($filename, 'w+')) {
-                       fwrite($f, $content);
-                       fclose($f);
-               } else {
-                       return new IXR_Error(500, __('Either the file is not writable, or something wrong happened. The file has not been updated.'));
-               }
-
-               return true;
+       public function blogger_setTemplate($args) {
+               return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
        }
 
        /**
@@ -1995,26 +4462,34 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return int
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type string $appkey (unused)
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type string $content
+        *     @type string $publish
+        * }
+        * @return int|IXR_Error
         */
-       function blogger_newPost($args) {
-
-               $this->escape($args);
+       public function blogger_newPost( $args ) {
+               $this->escape( $args );
 
-               $blog_ID    = (int) $args[1]; /* though we don't use it yet */
                $username = $args[2];
-               $password  = $args[3];
-               $content    = $args[4];
-               $publish    = $args[5];
+               $password = $args[3];
+               $content  = $args[4];
+               $publish  = $args[5];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'blogger.newPost');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.newPost' );
 
                $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-               if ( !current_user_can($cap) )
+               if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
                        return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
 
                $post_status = ($publish) ? 'publish' : 'draft';
@@ -2028,7 +4503,7 @@ class wp_xmlrpc_server extends IXR_Server {
                $post_date = current_time('mysql');
                $post_date_gmt = current_time('mysql', 1);
 
-               $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
+               $post_data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
 
                $post_ID = wp_insert_post($post_data);
                if ( is_wp_error( $post_ID ) )
@@ -2039,7 +4514,15 @@ class wp_xmlrpc_server extends IXR_Server {
 
                $this->attach_uploads( $post_ID, $post_content );
 
-               logIO('O', "Posted ! ID: $post_ID");
+               /**
+                * Fires after a new post has been successfully created via the XML-RPC Blogger API.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $post_ID ID of the new post.
+                * @param array $args    An array of new post arguments.
+                */
+               do_action( 'xmlrpc_call_success_blogger_newPost', $post_ID, $args );
 
                return $post_ID;
        }
@@ -2049,51 +4532,72 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return bool true when done.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $post_ID
+        *     @type string $username
+        *     @type string $password
+        *     @type string $content
+        * }
+        * @return true|IXR_Error true when done.
         */
-       function blogger_editPost($args) {
+       public function blogger_editPost( $args ) {
 
                $this->escape($args);
 
-               $post_ID     = (int) $args[1];
-               $username  = $args[2];
-               $password   = $args[3];
-               $content     = $args[4];
-               $publish     = $args[5];
+               $post_ID  = (int) $args[1];
+               $username = $args[2];
+               $password = $args[3];
+               $content  = $args[4];
 
-               if ( !$user = $this->login($username, $password) )
+               if ( ! $user = $this->login( $username, $password ) ) {
                        return $this->error;
+               }
 
-               do_action('xmlrpc_call', 'blogger.editPost');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.editPost' );
 
-               $actual_post = wp_get_single_post($post_ID,ARRAY_A);
+               $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 ( ! $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) )
-                       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');
+               if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+                       return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
+               }
+               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.' ) );
+               }
 
-               $result = wp_update_post($postdata);
+               $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'];
 
-               if ( !$result )
-                       return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+               $result = wp_update_post( $postdata );
 
-               $this->attach_uploads( $ID, $post_content );
+               if ( ! $result ) {
+                       return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+               }
+               $this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
+
+               /**
+                * Fires after a post has been successfully updated via the XML-RPC Blogger API.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $post_ID ID of the updated post.
+                * @param array $args    An array of arguments for the post to edit.
+                */
+               do_action( 'xmlrpc_call_success_blogger_editPost', $post_ID, $args );
 
                return true;
        }
@@ -2103,23 +4607,30 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return bool True when post is deleted.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $post_ID
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return true|IXR_Error True when post is deleted.
         */
-       function blogger_deletePost($args) {
-               $this->escape($args);
+       public function blogger_deletePost( $args ) {
+               $this->escape( $args );
 
-               $post_ID     = (int) $args[1];
-               $username  = $args[2];
-               $password   = $args[3];
-               $publish     = $args[4];
+               $post_ID  = (int) $args[1];
+               $username = $args[2];
+               $password = $args[3];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'blogger.deletePost');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'blogger.deletePost' );
 
-               $actual_post = wp_get_single_post($post_ID,ARRAY_A);
+               $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.'));
@@ -2132,6 +4643,16 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( !$result )
                        return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
 
+               /**
+                * Fires after a post has been successfully deleted via the XML-RPC Blogger API.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $post_ID ID of the deleted post.
+                * @param array $args    An array of arguments to delete the post.
+                */
+               do_action( 'xmlrpc_call_success_blogger_deletePost', $post_ID, $args );
+
                return true;
        }
 
@@ -2162,37 +4683,41 @@ class wp_xmlrpc_server extends IXR_Server {
         *  - mt_allow_pings - can be 'open' or 'closed'
         *  - date_created_gmt
         *  - dateCreated
+        *  - wp_post_thumbnail
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters. Contains:
-        *  - blog_id
-        *  - username
-        *  - password
-        *  - content_struct
-        *  - publish
-        * @return int
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $content_struct
+        *     @type int    $publish
+        * }
+        * @return int|IXR_Error
         */
-       function mw_newPost($args) {
+       public function mw_newPost($args) {
                $this->escape($args);
 
-               $blog_ID     = (int) $args[0]; // we will support this in the near future
-               $username  = $args[1];
-               $password   = $args[2];
+               $username       = $args[1];
+               $password       = $args[2];
                $content_struct = $args[3];
-               $publish     = isset( $args[4] ) ? $args[4] : 0;
+               $publish        = isset( $args[4] ) ? $args[4] : 0;
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'metaWeblog.newPost');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
 
                $page_template = '';
                if ( !empty( $content_struct['post_type'] ) ) {
                        if ( $content_struct['post_type'] == 'page' ) {
                                if ( $publish )
                                        $cap  = 'publish_pages';
-                               elseif ('publish' == $content_struct['page_status'])
+                               elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] )
                                        $cap  = 'publish_pages';
                                else
                                        $cap = 'edit_pages';
@@ -2203,7 +4728,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        } elseif ( $content_struct['post_type'] == 'post' ) {
                                if ( $publish )
                                        $cap  = 'publish_posts';
-                               elseif ('publish' == $content_struct['post_status'])
+                               elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] )
                                        $cap  = 'publish_posts';
                                else
                                        $cap = 'edit_posts';
@@ -2211,12 +4736,12 @@ class wp_xmlrpc_server extends IXR_Server {
                                $post_type = 'post';
                        } else {
                                // No other post_type values are allowed here
-                               return new IXR_Error( 401, __( 'Invalid post type.' ) );
+                               return new IXR_Error( 401, __( 'Invalid post type' ) );
                        }
                } else {
                        if ( $publish )
                                $cap  = 'publish_posts';
-                       elseif ('publish' == $content_struct['post_status'])
+                       elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
                                $cap  = 'publish_posts';
                        else
                                $cap = 'edit_posts';
@@ -2224,6 +4749,8 @@ class wp_xmlrpc_server extends IXR_Server {
                        $post_type = 'post';
                }
 
+               if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+                       return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
                if ( !current_user_can( $cap ) )
                        return new IXR_Error( 401, $error_message );
 
@@ -2256,20 +4783,22 @@ class wp_xmlrpc_server extends IXR_Server {
                $post_author = $user->ID;
 
                // If an author id was provided then use it instead.
-               if ( isset($content_struct['wp_author_id']) && ($user->ID != $content_struct['wp_author_id']) ) {
+               if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
                        switch ( $post_type ) {
                                case "post":
-                                       if ( !current_user_can('edit_others_posts') )
-                                               return(new IXR_Error(401, __('You are not allowed to post as this user')));
+                                       if ( !current_user_can( 'edit_others_posts' ) )
+                                               return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
                                        break;
                                case "page":
-                                       if ( !current_user_can('edit_others_pages') )
-                                               return(new IXR_Error(401, __('You are not allowed to create pages as this user')));
+                                       if ( !current_user_can( 'edit_others_pages' ) )
+                                               return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
                                        break;
                                default:
-                                       return(new IXR_Error(401, __('Invalid post type.')));
-                                       break;
+                                       return new IXR_Error( 401, __( 'Invalid post type' ) );
                        }
+                       $author = get_userdata( $content_struct['wp_author_id'] );
+                       if ( ! $author )
+                               return new IXR_Error( 404, __( 'Invalid author ID.' ) );
                        $post_author = $content_struct['wp_author_id'];
                }
 
@@ -2307,7 +4836,7 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $comment_status = 'open';
                                                break;
                                        default:
-                                               $comment_status = get_option('default_comment_status');
+                                               $comment_status = get_default_comment_status( $post_type );
                                                break;
                                }
                        } else {
@@ -2320,12 +4849,12 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $comment_status = 'open';
                                                break;
                                        default:
-                                               $comment_status = get_option('default_comment_status');
+                                               $comment_status = get_default_comment_status( $post_type );
                                                break;
                                }
                        }
                } else {
-                       $comment_status = get_option('default_comment_status');
+                       $comment_status = get_default_comment_status( $post_type );
                }
 
                if ( isset($content_struct['mt_allow_pings']) ) {
@@ -2338,7 +4867,7 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $ping_status = 'open';
                                                break;
                                        default:
-                                               $ping_status = get_option('default_ping_status');
+                                               $ping_status = get_default_comment_status( $post_type, 'pingback' );
                                                break;
                                }
                        } else {
@@ -2350,12 +4879,12 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $ping_status = 'open';
                                                break;
                                        default:
-                                               $ping_status = get_option('default_ping_status');
+                                               $ping_status = get_default_comment_status( $post_type, 'pingback' );
                                                break;
                                }
                        }
                } else {
-                       $ping_status = get_option('default_ping_status');
+                       $ping_status = get_default_comment_status( $post_type, 'pingback' );
                }
 
                if ( $post_more )
@@ -2370,7 +4899,8 @@ class wp_xmlrpc_server extends IXR_Server {
 
                // Do some timestamp voodoo
                if ( !empty( $content_struct['date_created_gmt'] ) )
-                       $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                       // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                       $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
                elseif ( !empty( $content_struct['dateCreated']) )
                        $dateCreated = $content_struct['dateCreated']->getIso();
 
@@ -2385,7 +4915,6 @@ class wp_xmlrpc_server extends IXR_Server {
                $post_category = array();
                if ( isset( $content_struct['categories'] ) ) {
                        $catnames = $content_struct['categories'];
-                       logIO('O', 'Post cats: ' . var_export($catnames,true));
 
                        if ( is_array($catnames) ) {
                                foreach ($catnames as $cat) {
@@ -2394,27 +4923,30 @@ class wp_xmlrpc_server extends IXR_Server {
                        }
                }
 
-               // We've got all the data -- post it:
                $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template');
 
-               $post_ID = wp_insert_post($postdata, true);
-               if ( is_wp_error( $post_ID ) )
-                       return new IXR_Error(500, $post_ID->get_error_message());
-
-               if ( !$post_ID )
-                       return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+               $post_ID = $postdata['ID'] = get_default_post_to_edit( $post_type, true )->ID;
 
                // 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']) )
                        $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 
+               if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
+                       if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+                               return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+
+                       unset( $content_struct['wp_post_thumbnail'] );
+               }
+
                // Handle enclosures
                $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
                $this->add_enclosure_if_new($post_ID, $thisEnclosure);
@@ -2424,29 +4956,46 @@ class wp_xmlrpc_server extends IXR_Server {
                // Handle post formats if assigned, value is validated earlier
                // in this function
                if ( isset( $content_struct['wp_post_format'] ) )
-                       wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
+                       set_post_format( $post_ID, $content_struct['wp_post_format'] );
+
+               $post_ID = wp_insert_post( $postdata, true );
+               if ( is_wp_error( $post_ID ) )
+                       return new IXR_Error(500, $post_ID->get_error_message());
+
+               if ( !$post_ID )
+                       return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
 
-               logIO('O', "Posted ! ID: $post_ID");
+               /**
+                * Fires after a new post has been successfully created via the XML-RPC MovableType API.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $post_ID ID of the new post.
+                * @param array $args    An array of arguments to create the new post.
+                */
+               do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args );
 
                return strval($post_ID);
        }
 
-       function add_enclosure_if_new($post_ID, $enclosure) {
+       /**
+        * @param integer $post_ID
+        * @param array   $enclosure
+        */
+       public function add_enclosure_if_new( $post_ID, $enclosure ) {
                if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
-
-                       $encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'];
+                       $encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
                        $found = false;
-                       foreach ( (array) get_post_custom($post_ID) as $key => $val) {
-                               if ($key == 'enclosure') {
-                                       foreach ( (array) $val as $enc ) {
-                                               if ($enc == $encstring) {
-                                                       $found = true;
-                                                       break 2;
-                                               }
+                       if ( $enclosures = get_post_meta( $post_ID, 'enclosure' ) ) {
+                               foreach ( $enclosures as $enc ) {
+                                       // This method used to omit the trailing new line. #23219
+                                       if ( rtrim( $enc, "\n" ) == rtrim( $encstring, "\n" ) ) {
+                                               $found = true;
+                                               break;
                                        }
                                }
                        }
-                       if (!$found)
+                       if ( ! $found )
                                add_post_meta( $post_ID, 'enclosure', $encstring );
                }
        }
@@ -2456,17 +5005,19 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 2.1.0
         *
+        * @global wpdb $wpdb
+        *
         * @param int $post_ID Post ID.
         * @param string $post_content Post Content for attachment.
         */
-       function attach_uploads( $post_ID, $post_content ) {
+       public function attach_uploads( $post_ID, $post_content ) {
                global $wpdb;
 
                // find any unattached files
                $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
                if ( is_array( $attachments ) ) {
                        foreach ( $attachments as $file ) {
-                               if ( strpos( $post_content, $file->guid ) !== false )
+                               if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
                                        $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
                        }
                }
@@ -2477,60 +5028,51 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return bool True on success.
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type string $username
+        *     @type string $password
+        *     @type array  $content_struct
+        *     @type int    $publish
+        * }
+        * @return bool|IXR_Error True on success.
         */
-       function mw_editPost($args) {
-
-               $this->escape($args);
+       public function mw_editPost( $args ) {
+               $this->escape( $args );
 
-               $post_ID     = (int) $args[0];
-               $username  = $args[1];
-               $password   = $args[2];
+               $post_ID        = (int) $args[0];
+               $username       = $args[1];
+               $password       = $args[2];
                $content_struct = $args[3];
-               $publish     = $args[4];
+               $publish        = isset( $args[4] ) ? $args[4] : 0;
 
-               if ( !$user = $this->login($username, $password) )
+               if ( ! $user = $this->login($username, $password) )
                        return $this->error;
 
-               do_action('xmlrpc_call', 'metaWeblog.editPost');
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
 
-               $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
-               $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-               $post_type = 'post';
-               $page_template = '';
-               if ( !empty( $content_struct['post_type'] ) ) {
-                       if ( $content_struct['post_type'] == 'page' ) {
-                               if ( $publish || 'publish' == $content_struct['page_status'] )
-                                       $cap  = 'publish_pages';
-                               else
-                                       $cap = 'edit_pages';
-                               $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
-                               $post_type = 'page';
-                               if ( !empty( $content_struct['wp_page_template'] ) )
-                                       $page_template = $content_struct['wp_page_template'];
-                       } elseif ( $content_struct['post_type'] == 'post' ) {
-                               if ( $publish || 'publish' == $content_struct['post_status'] )
-                                       $cap  = 'publish_posts';
-                               else
-                                       $cap = 'edit_posts';
-                               $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                               $post_type = 'post';
-                       } else {
-                               // No other post_type values are allowed here
-                               return new IXR_Error( 401, __( 'Invalid post type.' ) );
-                       }
-               } else {
-                       if ( $publish || 'publish' == $content_struct['post_status'] )
-                               $cap  = 'publish_posts';
-                       else
-                               $cap = 'edit_posts';
-                       $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                       $post_type = 'post';
-               }
+               $postdata = get_post( $post_ID, ARRAY_A );
 
-               if ( !current_user_can( $cap ) )
-                       return new IXR_Error( 401, $error_message );
+               /*
+                * If there is no post data for the give post id, stop now and return an error.
+                * Otherwise a new post will be created (which was the old behavior).
+                */
+               if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
+                       return new IXR_Error( 404, __( 'Invalid 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.' ) );
+
+               // Use wp.editPost to edit post types other than post and page.
+               if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
+                       return new IXR_Error( 401, __( 'Invalid post type' ) );
+
+               // Thwart attempt to change the post type.
+               if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) )
+                       return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
 
                // Check for a valid post format if one was given
                if ( isset( $content_struct['wp_post_format'] ) ) {
@@ -2540,19 +5082,18 @@ class wp_xmlrpc_server extends IXR_Server {
                        }
                }
 
-               $postdata = wp_get_single_post($post_ID, ARRAY_A);
-
-               // If there is no post data for the give post id, stop
-               // now and return an error.  Other wise a new post will be
-               // created (which was the old behavior).
-               if ( empty($postdata["ID"]) )
-                       return(new IXR_Error(404, __('Invalid post ID.')));
-
                $this->escape($postdata);
-               extract($postdata, EXTR_SKIP);
+
+               $ID = $postdata['ID'];
+               $post_content = $postdata['post_content'];
+               $post_title = $postdata['post_title'];
+               $post_excerpt = $postdata['post_excerpt'];
+               $post_password = $postdata['post_password'];
+               $post_parent = $postdata['post_parent'];
+               $post_type = $postdata['post_type'];
+               $menu_order = $postdata['menu_order'];
 
                // Let WordPress manage slug if none was provided.
-               $post_name = "";
                $post_name = $postdata['post_name'];
                if ( isset($content_struct['wp_slug']) )
                        $post_name = $content_struct['wp_slug'];
@@ -2569,24 +5110,33 @@ class wp_xmlrpc_server extends IXR_Server {
                if ( isset($content_struct['wp_page_order']) )
                        $menu_order = $content_struct['wp_page_order'];
 
+               $page_template = null;
+               if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
+                       $page_template = $content_struct['wp_page_template'];
+
                $post_author = $postdata['post_author'];
 
                // Only set the post_author if one is set.
-               if ( isset($content_struct['wp_author_id']) && ($user->ID != $content_struct['wp_author_id']) ) {
-                       switch ( $post_type ) {
-                               case 'post':
-                                       if ( !current_user_can('edit_others_posts') )
-                                               return(new IXR_Error(401, __('You are not allowed to change the post author as this user.')));
-                                       break;
-                               case 'page':
-                                       if ( !current_user_can('edit_others_pages') )
-                                               return(new IXR_Error(401, __('You are not allowed to change the page author as this user.')));
-                                       break;
-                               default:
-                                       return(new IXR_Error(401, __('Invalid post type.')));
-                                       break;
+               if ( isset( $content_struct['wp_author_id'] ) ) {
+                       // Check permissions if attempting to switch author to or from another user.
+                       if ( $user->ID != $content_struct['wp_author_id'] || $user->ID != $post_author ) {
+                               switch ( $post_type ) {
+                                       case 'post':
+                                               if ( ! current_user_can( 'edit_others_posts' ) ) {
+                                                       return new IXR_Error( 401, __( 'You are not allowed to change the post author as this user.' ) );
+                                               }
+                                               break;
+                                       case 'page':
+                                               if ( ! current_user_can( 'edit_others_pages' ) ) {
+                                                       return new IXR_Error( 401, __( 'You are not allowed to change the page author as this user.' ) );
+                                               }
+                                               break;
+                                       default:
+                                               return new IXR_Error( 401, __( 'Invalid post type' ) );
+                                               break;
+                               }
+                               $post_author = $content_struct['wp_author_id'];
                        }
-                       $post_author = $content_struct['wp_author_id'];
                }
 
                if ( isset($content_struct['mt_allow_comments']) ) {
@@ -2599,7 +5149,7 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $comment_status = 'open';
                                                break;
                                        default:
-                                               $comment_status = get_option('default_comment_status');
+                                               $comment_status = get_default_comment_status( $post_type );
                                                break;
                                }
                        } else {
@@ -2612,7 +5162,7 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $comment_status = 'open';
                                                break;
                                        default:
-                                               $comment_status = get_option('default_comment_status');
+                                               $comment_status = get_default_comment_status( $post_type );
                                                break;
                                }
                        }
@@ -2628,7 +5178,7 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $ping_status = 'open';
                                                break;
                                        default:
-                                               $ping_status = get_option('default_ping_status');
+                                               $ping_status = get_default_comment_status( $post_type, 'pingback' );
                                                break;
                                }
                        } else {
@@ -2640,14 +5190,17 @@ class wp_xmlrpc_server extends IXR_Server {
                                                $ping_status = 'open';
                                                break;
                                        default:
-                                               $ping_status = get_option('default_ping_status');
+                                               $ping_status = get_default_comment_status( $post_type, 'pingback' );
                                                break;
                                }
                        }
                }
 
-               $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
-               $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
+               if ( isset( $content_struct['title'] ) )
+                       $post_title =  $content_struct['title'];
+
+               if ( isset( $content_struct['description'] ) )
+                       $post_content = $content_struct['description'];
 
                $post_category = array();
                if ( isset( $content_struct['categories'] ) ) {
@@ -2659,7 +5212,9 @@ class wp_xmlrpc_server extends IXR_Server {
                        }
                }
 
-               $post_excerpt = isset( $content_struct['mt_excerpt'] ) ? $content_struct['mt_excerpt'] : null;
+               if ( isset( $content_struct['mt_excerpt'] ) )
+                       $post_excerpt =  $content_struct['mt_excerpt'];
+
                $post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
 
                $post_status = $publish ? 'publish' : 'draft';
@@ -2680,10 +5235,11 @@ class wp_xmlrpc_server extends IXR_Server {
                $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
 
                if ( ('publish' == $post_status) ) {
-                       if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
-                               return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
-                       else if ( !current_user_can('publish_posts') )
-                               return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+                       if ( ( 'page' == $post_type ) && ! current_user_can( 'publish_pages' ) ) {
+                               return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
+                       } elseif ( ! current_user_can( 'publish_posts' ) ) {
+                               return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+                       }
                }
 
                if ( $post_more )
@@ -2696,9 +5252,10 @@ class wp_xmlrpc_server extends IXR_Server {
                                $to_ping = implode(' ', $to_ping);
                }
 
-               // Do some timestamp voodoo
+               // Do some timestamp voodoo.
                if ( !empty( $content_struct['date_created_gmt'] ) )
-                       $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force
+                       // We know this is supposed to be GMT, so we're going to slap that Z on there by force.
+                       $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
                elseif ( !empty( $content_struct['dateCreated']) )
                        $dateCreated = $content_struct['dateCreated']->getIso();
 
@@ -2710,7 +5267,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        $post_date_gmt = $postdata['post_date_gmt'];
                }
 
-               // We've got all the data -- post it:
+               // We've got all the data -- post it.
                $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
 
                $result = wp_update_post($newpost, true);
@@ -2722,27 +5279,49 @@ class wp_xmlrpc_server extends IXR_Server {
 
                // 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'];
+                       $data['post_type'] = 'post';
+                       $error = $this->_toggle_sticky( $data, true );
+                       if ( $error ) {
+                               return $error;
+                       }
                }
 
                if ( isset($content_struct['custom_fields']) )
                        $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 
-               // Handle enclosures
+               if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
+
+                       // Empty value deletes, non-empty value adds/updates.
+                       if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
+                               delete_post_thumbnail( $post_ID );
+                       } else {
+                               if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+                                       return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+                       }
+                       unset( $content_struct['wp_post_thumbnail'] );
+               }
+
+               // Handle enclosures.
                $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
                $this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
                $this->attach_uploads( $ID, $post_content );
 
-               // Handle post formats if assigned, validation is handled
-               // earlier in this function
+               // Handle post formats if assigned, validation is handled earlier in this function.
                if ( isset( $content_struct['wp_post_format'] ) )
-                       wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
-
-               logIO('O',"(MW) Edited ! ID: $post_ID");
+                       set_post_format( $post_ID, $content_struct['wp_post_format'] );
+
+               /**
+                * Fires after a post has been successfully updated via the XML-RPC MovableType API.
+                *
+                * @since 3.4.0
+                *
+                * @param int   $post_ID ID of the updated post.
+                * @param array $args    An array of arguments to update the post.
+                */
+               do_action( 'xmlrpc_call_success_mw_editPost', $post_ID, $args );
 
                return true;
        }
@@ -2752,34 +5331,41 @@ class wp_xmlrpc_server extends IXR_Server {
         *
         * @since 1.5.0
         *
-        * @param array $args Method parameters.
-        * @return array
+        * @param array  $args {
+        *     Method arguments. Note: arguments must be ordered as documented.
+        *
+        *     @type int    $blog_id (unused)
+        *     @type int    $post_ID
+        *     @type string $username
+        *     @type string $password
+        * }
+        * @return array|IXR_Error
         */
-       function mw_getPost($args) {
-
-               $this->escape($args);
+       public function mw_getPost( $args ) {
+               $this->escape( $args );
 
-               $post_ID     = (int) $args[0];
-               $username  = $args[1];
-               $password   = $args[2];
+               $post_ID  = (int) $args[0];
+               $username = $args[1];
+               $password = $args[2];
 
                if ( !$user = $this->login($username, $password) )
                        return $this->error;
 
+               $postdata = get_post($post_ID, ARRAY_A);
+               if ( ! $postdata )
+                       return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+
                if ( !current_user_can( 'edit_post', $post_ID ) )
                        return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
 
-               do_action('xmlrpc_call', 'metaWeblog.getPost');
-
-               $postdata = wp_get_single_post($post_ID, ARRAY_A);
+               /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
+               do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
 
                if ($postdata['post_date'] != '') {
-                       $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date'], false);
-                       $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt'], false);
-
-                       // For drafts use the GMT version of the post date
-                       if ( $postdata['post_status'] == 'draft' )
-                               $post_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $postdata['post_date'] ), 'Ymd\TH:i:s' );
+                       $post_date = $this->_convert_date( $postdata['post_date'] );
+                       $post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'],  $postdata['post_date'] );
+                       $post_modified = $this->_convert_date( $postdata['post_modified'] );
+                       $post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
 
                        $categories = array();
                        $catids = wp_get_post_categories($post_ID);
@@ -2822,7 +5408,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        foreach ( (array) get_post_custom($post_ID) as $key => $val) {
                                if ($key == 'enclosure') {
                                        foreach ( (array) $val as $enc ) {
-                                               $encdata = split("\n", $enc);
+                                               $encdata = explode("\n", $enc);
                                                $enclosure['url'] = trim(htmlspecialchars($encdata[0]));
                                                $enclosure['length'] = (int) trim($encdata[1]);
                                                $enclosure['type'] = trim($encdata[2]);
@@ -2832,7 +5418,7 @@ class wp_xmlrpc_server extends IXR_Server {
                        }
 
                        $resp = array(
-                               'dateCreated' => new IXR_Date($post_date),
+                               'dateCreated' => $post_date,
                                'userid' => $postdata['post_author'],
                                'postid' => $postdata['ID'],
                                'description' => $post['main'],
@@ -2844,22 +5430,27 @@ class wp_xmlrpc_server extends IXR_Server {
                                'categories' => $categories,
                                'mt_excerpt' => $postdata['post_excerpt'],
                                'mt_text_more' => $post['extended'],
+  &n