enmi-conf.org: comparison wp/wp-includes/class-wp-xmlrpc-server.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 * Implements compatibility for Blogger API, MetaWeblog API, MovableType, and
 * pingback. Additional WordPress API for managing comments, pages, posts,
 * options, etc.
 *
 * 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().
+* via the {@see 'xmlrpc_enabled'} filter found in wp_xmlrpc_server::login().
 *
-* @package WordPress
-* @subpackage Publishing
 * @since 1.5.0
+*
+* @see IXR_Server
 */
 class wp_xmlrpc_server extends IXR_Server {
 	/**
+	 * Methods.
+	 *
 	 * @var array
 	 */
 	public $methods;
-	/**
+	/**
+	 * Blog options.
+	 *
 	 * @var array
 	 */
 	public $blog_options;
-	/**
+	/**
+	 * IXR_Error instance.
+	 *
 	 * @var IXR_Error
 	 */
 	public $error;
-	/**
-	 * Register all of the XMLRPC methods that XMLRPC server understands.
+	/**
+	 * Flags that the user authentication has failed in this instance of wp_xmlrpc_server.
+	 *
+	 * @var bool
+	 */
+	protected $auth_failed = false;
+	/**
+	 * Registers all of the XMLRPC methods that XMLRPC server understands.
 	 *
 	 * Sets up server and method property. Passes XMLRPC
-	 * methods through the 'xmlrpc_methods' filter to allow plugins to extend
+	 * methods through the {@see 'xmlrpc_methods'} filter to allow plugins to extend
-	 * or replace XMLRPC methods.
+	 * or replace XML-RPC methods.
 	 *
 	 * @since 1.5.0
 	 */
 	public function __construct() {
 		$this->methods = array(
 		);
 		$this->initialise_blog_option_info();
 		/**
-		 * Filter the methods exposed by the XML-RPC server.
+		 * Filters 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
 		 *
 		 */
 		$this->methods = apply_filters( 'xmlrpc_methods', $this->methods );
 	}
 	/**
-	 * Make private/protected methods readable for backwards compatibility.
+	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
-	 * @return mixed|bool Return value of the callback, false otherwise.
+	 * @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;
 	}
+	/**
+	 * Serves the XML-RPC request.
+	 *
+	 * @since 2.9.0
+	 */
 	public function serve_request() {
 		$this->IXR_Server($this->methods);
 	}
 	/**
 	 * Test XMLRPC API by saying, "Hello!" to client.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method Parameters.
+	 * @return string Hello string response.
-	 * @return string
+	 */
-	 */
+	public function sayHello() {
-	public function sayHello($args) {
 		return 'Hello!';
 	}
 	/**
 	 * Test XMLRPC API by adding two numbers for client.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method Parameters.
+	 * @param array  $args {
-	 * @return int
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function addTwoNumbers($args) {
+	 *     @type int $number1 A number to add.
+	 *     @type int $number2 A second number to add.
+	 * }
+	 * @return int Sum of the two given numbers.
+	 */
+	public function addTwoNumbers( $args ) {
 		$number1 = $args[0];
 		$number2 = $args[1];
 		return $number1 + $number2;
 	}
 		if ( false === $enabled ) {
 			$enabled = apply_filters( 'option_enable_xmlrpc', true );
 		}
 		/**
-		 * Filter whether XML-RPC is enabled.
+		 * Filters whether XML-RPC methods requiring authentication are enabled.
 		 *
-		 * This is the proper filter for turning off XML-RPC.
+		 * Contrary to the way it's named, this filter does not control whether XML-RPC is *fully*
+		 * enabled, rather, it only controls whether XML-RPC methods requiring authentication - such
+		 * as for publishing purposes - are enabled.
+		 *
+		 * Further, the filter does not control whether pingbacks or other custom endpoints that don't
+		 * require authentication are enabled. This behavior is expected, and due to how parity was matched
+		 * with the `enable_xmlrpc` UI option the filter replaced when it was introduced in 3.5.
+		 *
+		 * To disable XML-RPC methods that require authentication, use:
+		 *
+		 *     add_filter( 'xmlrpc_enabled', '__return_false' );
+		 *
+		 * For more granular control over all XML-RPC methods and requests, see the {@see 'xmlrpc_methods'}
+		 * and {@see 'xmlrpc_element_limit'} hooks.
 		 *
 		 * @since 3.5.0
 		 *
 		 * @param bool $enabled Whether XML-RPC is enabled. Default true.
 		 */
 		if ( ! $enabled ) {
 			$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
 			return false;
 		}
-		$user = wp_authenticate($username, $password);
+		if ( $this->auth_failed ) {
+			$user = new WP_Error( 'login_prevented' );
-		if (is_wp_error($user)) {
+		} else {
+			$user = wp_authenticate( $username, $password );
+		}
+		if ( is_wp_error( $user ) ) {
 			$this->error = new IXR_Error( 403, __( 'Incorrect username or password.' ) );
+			// Flag that authentication has failed once on this wp_xmlrpc_server instance
+			$this->auth_failed = true;
 			/**
-			 * Filter the XML-RPC user login error message.
+			 * Filters 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.
 	/**
 	 * Check user's credentials. Deprecated.
 	 *
 	 * @since 1.5.0
-	 * @deprecated 2.8.0
+	 * @deprecated 2.8.0 Use wp_xmlrpc_server::login()
-	 * @deprecated use wp_xmlrpc_server::login
+	 * @see wp_xmlrpc_server::login()
-	 * @see wp_xmlrpc_server::login
 	 *
 	 * @param string $username User's username.
 	 * @param string $password User's password.
 	 * @return bool Whether authentication passed.
 	 */
 	 * 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|array Type matches $data and sanitized for the database.
+	 * @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 ( (array) $fields as $meta ) {
 			if ( isset($meta['id']) ) {
 				$meta['id'] = (int) $meta['id'];
 				$pmeta = get_metadata_by_mid( 'post', $meta['id'] );
+				if ( ! $pmeta || $pmeta->post_id != $post_id ) {
+					continue;
+				}
 				if ( isset($meta['key']) ) {
 					$meta['key'] = wp_unslash( $meta['key'] );
 					if ( $meta['key'] !== $pmeta->meta_key )
 						continue;
 					$meta['value'] = wp_unslash( $meta['value'] );
 			}
 		}
 	}
 	/**
+	 * Retrieve custom fields for a term.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @param int $term_id Term ID.
+	 * @return array Array of custom fields, if they exist.
+	 */
+	public function get_term_custom_fields( $term_id ) {
+		$term_id = (int) $term_id;
+		$custom_fields = array();
+		foreach ( (array) has_term_meta( $term_id ) as $meta ) {
+			if ( ! current_user_can( 'edit_term_meta', $term_id ) ) {
+				continue;
+			}
+			$custom_fields[] = array(
+				'id'    => $meta['meta_id'],
+				'key'   => $meta['meta_key'],
+				'value' => $meta['meta_value'],
+			);
+		}
+		return $custom_fields;
+	}
+	/**
+	 * Set custom fields for a term.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @param int $term_id Term ID.
+	 * @param array $fields Custom fields.
+	 */
+	public function set_term_custom_fields( $term_id, $fields ) {
+		$term_id = (int) $term_id;
+		foreach ( (array) $fields as $meta ) {
+			if ( isset( $meta['id'] ) ) {
+				$meta['id'] = (int) $meta['id'];
+				$pmeta = get_metadata_by_mid( 'term', $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_term_meta', $term_id ) ) {
+						update_metadata_by_mid( 'term', $meta['id'], $meta['value'] );
+					}
+				} elseif ( current_user_can( 'delete_term_meta', $term_id ) ) {
+					delete_metadata_by_mid( 'term', $meta['id'] );
+				}
+			} elseif ( current_user_can( 'add_term_meta', $term_id ) ) {
+				add_term_meta( $term_id, $meta['key'], $meta['value'] );
+			}
+		}
+	}
+	/**
 	 * Set up blog options property.
 	 *
-	 * Passes property through 'xmlrpc_blog_options' filter.
+	 * Passes property through {@see 'xmlrpc_blog_options'} filter.
 	 *
 	 * @since 2.6.0
 	 */
 	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
+				'value'         => get_bloginfo( 'version' )
 			),
 			'blog_url'          => array(
 				'desc'          => __( 'WordPress Address (URL)' ),
 				'readonly'      => true,
 				'option'        => 'siteurl'
 			'medium_size_h'     => array(
 				'desc'          => __( 'Medium size image height' ),
 				'readonly'      => false,
 				'option'        => 'medium_size_h'
 			),
+			'medium_large_size_w'   => array(
+				'desc'          => __( 'Medium-Large size image width' ),
+				'readonly'      => false,
+				'option'        => 'medium_large_size_w'
+			),
+			'medium_large_size_h'   => array(
+				'desc'          => __( 'Medium-Large size image height' ),
+				'readonly'      => false,
+				'option'        => 'medium_large_size_h'
+			),
 			'large_size_w'      => array(
 				'desc'          => __( 'Large size image width' ),
 				'readonly'      => false,
 				'option'        => 'large_size_w'
 			),
 				'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)' ),
+				'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.
+		 * Filters the XML-RPC blog options property.
 		 *
 		 * @since 2.6.0
 		 *
 		 * @param array $blog_options An array of XML-RPC blog options.
 		 */
 	/**
 	 * Retrieve the blogs of the user.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array $args {
-	 *  - username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - password
+	 *
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 * }
 	 * @return array|IXR_Error Array contains:
 	 *  - 'isAdmin'
+	 *  - 'isPrimary' - whether the blog is the user's primary blog
 	 *  - 'url'
 	 *  - 'blogid'
 	 *  - 'blogName'
 	 *  - 'xmlrpc' - url of xmlrpc endpoint
 	 */
 	public function wp_getUsersBlogs( $args ) {
+		if ( ! $this->minimum_args( $args, 2 ) ) {
+			return $this->error;
+		}
 		// If this isn't on WPMU then just use blogger_getUsersBlogs
 		if ( !is_multisite() ) {
 			array_unshift( $args, 1 );
 			return $this->blogger_getUsersBlogs( $args );
 		}
 		 * 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 method $name The method name.
+		 * @param string $name The method name.
 		 */
 		do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
 		$blogs = (array) get_blogs_of_user( $user->ID );
 		$struct = array();
+		$primary_blog_id = 0;
+		$active_blog = get_active_blog_for_user( $user->ID );
+		if ( $active_blog ) {
+			$primary_blog_id = (int) $active_blog->blog_id;
+		}
 		foreach ( $blogs as $blog ) {
-			// Don't include blogs that aren't hosted at this site
+			// Don't include blogs that aren't hosted at this site.
-			if ( $blog->site_id != get_current_site()->id )
+			if ( $blog->site_id != get_current_network_id() )
 				continue;
 			$blog_id = $blog->userblog_id;
 			switch_to_blog( $blog_id );
 			$is_admin = current_user_can( 'manage_options' );
+			$is_primary = ( (int) $blog_id === $primary_blog_id );
 			$struct[] = array(
-				'isAdmin'		=> $is_admin,
+				'isAdmin'   => $is_admin,
-				'url'			=> home_url( '/' ),
+				'isPrimary' => $is_primary,
-				'blogid'		=> (string) $blog_id,
+				'url'       => home_url( '/' ),
-				'blogName'		=> get_option( 'blogname' ),
+				'blogid'    => (string) $blog_id,
-				'xmlrpc'		=> site_url( 'xmlrpc.php', 'rpc' ),
+				'blogName'  => get_option( 'blogname' ),
+				'xmlrpc'    => site_url( 'xmlrpc.php', 'rpc' ),
 			);
 			restore_current_blog();
 		}
 	 * Checks if the method received at least the minimum number of arguments.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param string|array $args Sanitize single string or array of strings.
-	 * @param int $count Minimum number of arguments.
+	 * @param int $count         Minimum number of arguments.
-	 * @return boolean if $args contains at least $count 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;
 	}
 	/**
 	 * Prepares taxonomy data for return in an XML-RPC object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param object $taxonomy The unprepared taxonomy data.
-	 * @param object $taxonomy The unprepared taxonomy data
+	 * @param array $fields    The subset of taxonomy fields to return.
-	 * @param array $fields The subset of taxonomy fields to return
+	 * @return array The prepared taxonomy data.
-	 * @return array The prepared taxonomy data
 	 */
 	protected function _prepare_taxonomy( $taxonomy, $fields ) {
 		$_taxonomy = array(
 			'name' => $taxonomy->name,
 			'label' => $taxonomy->label,
 		if ( in_array( 'object_type', $fields ) )
 			$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
 		/**
-		 * Filter XML-RPC-prepared data for the given taxonomy.
+		 * Filters XML-RPC-prepared data for the given taxonomy.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param array  $_taxonomy An array of taxonomy data.
+		 * @param array       $_taxonomy An array of taxonomy data.
-		 * @param object $taxonomy  Taxonomy object.
+		 * @param WP_Taxonomy $taxonomy  Taxonomy object.
-		 * @param array  $fields    The subset of taxonomy fields to return.
+		 * @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.
-	 * @param array|object $term The unprepared term data
+	 * @return array The prepared term data.
-	 * @return array The prepared term data
 	 */
 	protected function _prepare_term( $term ) {
 		$_term = $term;
-		if ( ! is_array( $_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['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'] );
+		// Get term meta.
+		$_term['custom_fields'] = $this->get_term_custom_fields( $_term['term_id'] );
 		/**
-		 * Filter XML-RPC-prepared data for the given term.
+		 * Filters 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.
 	}
 	/**
 	 * Convert a WordPress date string to an IXR_Date object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param string $date Date string to convert.
-	 * @param string $date
+	 * @return IXR_Date IXR_Date object.
-	 * @return IXR_Date
 	 */
 	protected function _convert_date( $date ) {
 		if ( $date === '0000-00-00 00:00:00' ) {
 			return new IXR_Date( '00000000T00:00:00Z' );
 		}
 	}
 	/**
 	 * Convert a WordPress GMT date string to an IXR_Date object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param string $date_gmt WordPress GMT date string.
-	 * @param string $date_gmt
+	 * @param string $date     Date string.
-	 * @param string $date
+	 * @return IXR_Date IXR_Date object.
-	 * @return IXR_Date
 	 */
 	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' ) );
 		}
 	}
 	/**
 	 * Prepares post data for return in an XML-RPC object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param array $post   The unprepared post data.
-	 * @param array $post The unprepared post data
+	 * @param array $fields The subset of post type fields to return.
-	 * @param array $fields The subset of post type fields to return
+	 * @return array The prepared post data.
-	 * @return array The prepared post data
 	 */
 	protected function _prepare_post( $post, $fields ) {
-		// holds the data for this post. built up based on $fields
+		// Holds the data for this post. built up based on $fields.
 		$_post = array( 'post_id' => strval( $post['ID'] ) );
-		// prepare common post fields
+		// 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_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'] ),
+			'link'              => get_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
+		// 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
+		// Consider future posts as published.
 		if ( $post_fields['post_status'] === 'future' )
 			$post_fields['post_status'] = 'publish';
-		// Fill in blank post format
+		// 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
+		// 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 );
 				$_post['enclosure']['type'] = trim( $encdata[2] );
 			}
 		}
 		/**
-		 * Filter XML-RPC-prepared date for the given post.
+		 * Filters 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.
 	}
 	/**
 	 * Prepares post data for return in an XML-RPC object.
 	 *
-	 * @access protected
+	 * @since 3.4.0
-	 *
+	 * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
-	 * @param object $post_type Post type object
+	 *
-	 * @param array $fields The subset of post fields to return
+	 * @param WP_Post_Type $post_type Post type object.
-	 * @return array The prepared post type data
+	 * @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,
 		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.
+		 * Filters XML-RPC-prepared date for the given post type.
 		 *
 		 * @since 3.4.0
-		 *
+		 * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
-		 * @param array  $_post_type An array of post type data.
+		 *
-		 * @param object $post_type  Post type object.
+		 * @param array        $_post_type An array of post type data.
+		 * @param WP_Post_Type $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 object $media_item The unprepared media item data
+	 * @param string $thumbnail_size The image size to use for the thumbnail URL.
-	 * @param string $thumbnail_size The image size to use for the thumbnail URL
+	 * @return array The prepared media item data.
-	 * @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 ),
 			'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 ),
+			'type'             => $media_item->post_mime_type
 		);
 		$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.
+		 * Filters 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.
 	}
 	/**
 	 * Prepares page data for return in an XML-RPC object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param object $page The unprepared page data.
-	 * @param object $page The unprepared page data
+	 * @return array The prepared 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 );
+		$link = get_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 );
 			'custom_fields'          => $this->get_custom_fields( $page->ID ),
 			'wp_page_template'       => $page_template
 		);
 		/**
-		 * Filter XML-RPC-prepared data for the given page.
+		 * Filters 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.
 	}
 	/**
 	 * Prepares comment data for return in an XML-RPC object.
 	 *
-	 * @access protected
+	 *
-	 *
+	 * @param object $comment The unprepared comment data.
-	 * @param object $comment The unprepared comment data
+	 * @return array The prepared 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 );
 			'author_ip'        => $comment->comment_author_IP,
 			'type'             => $comment->comment_type,
 		);
 		/**
-		 * Filter XML-RPC-prepared data for the given comment.
+		 * Filters XML-RPC-prepared data for the given comment.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param array  $_comment An array of prepared comment data.
+		 * @param array      $_comment An array of prepared comment data.
-		 * @param object $comment  Comment object.
+		 * @param WP_Comment $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 WP_User $user The unprepared user object
+	 * @param array   $fields The subset of user fields to return.
-	 * @param array $fields The subset of user fields to return
+	 * @return array The prepared user data.
-	 * @return array The prepared user data
 	 */
 	protected function _prepare_user( $user, $fields ) {
 		$_user = array( 'user_id' => strval( $user->ID ) );
 		$user_fields = array(
 			$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.
+		 * Filters 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.
 	/**
 	 * Create a new post for any registered post type.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @link https://en.wikipedia.org/wiki/RSS_enclosure for information on RSS enclosures.
-	 *  - int     $blog_id (unused)
+	 *
-	 *  - string  $username
+	 * @param array  $args {
-	 *  - string  $password
+	 *     Method arguments. Note: top-level arguments must be ordered as documented.
-	 *  - array   $content_struct
+	 *
-	 *      $content_struct can contain:
+	 *     @type int    $blog_id        Blog ID (unused).
-	 *      - post_type (default: 'post')
+	 *     @type string $username       Username.
-	 *      - post_status (default: 'draft')
+	 *     @type string $password       Password.
-	 *      - post_title
+	 *     @type array  $content_struct {
-	 *      - post_author
+	 *         Content struct for adding a new post. See wp_insert_post() for information on
-	 *      - post_excerpt
+	 *         additional post fields
-	 *      - post_content
+	 *
-	 *      - post_date_gmt | post_date
+	 *         @type string $post_type      Post type. Default 'post'.
-	 *      - post_format
+	 *         @type string $post_status    Post status. Default 'draft'
-	 *      - post_password
+	 *         @type string $post_title     Post title.
-	 *      - comment_status - can be 'open' | 'closed'
+	 *         @type int    $post_author    Post author ID.
-	 *      - ping_status - can be 'open' | 'closed'
+	 *         @type string $post_excerpt   Post excerpt.
-	 *      - sticky
+	 *         @type string $post_content   Post content.
-	 *      - post_thumbnail - ID of a media item to use as the post thumbnail/featured image
+	 *         @type string $post_date_gmt  Post date in GMT.
-	 *      - custom_fields - array, with each element containing 'key' and 'value'
+	 *         @type string $post_date      Post date.
-	 *      - terms - array, with taxonomy names as keys and arrays of term IDs as values
+	 *         @type string $post_password  Post password (20-character limit).
-	 *      - terms_names - array, with taxonomy names as keys and arrays of term names as values
+	 *         @type string $comment_status Post comment enabled status. Accepts 'open' or 'closed'.
-	 *      - enclosure
+	 *         @type string $ping_status    Post ping status. Accepts 'open' or 'closed'.
-	 *      - any other fields supported by wp_insert_post()
+	 *         @type bool   $sticky         Whether the post should be sticky. Automatically false if
-	 * @return string|IXR_Error post_id
+	 *                                      `$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;
 	private function _is_greater_than_one( $count ) {
 		return $count > 1;
 	}
 	/**
-	 * Helper method for wp_newPost and wp_editPost, containing shared logic.
+	 * Encapsulate the logic for sticking a post
+	 * and determining if the user has permission to do so
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param array $post_data
+	 * @param bool  $update
+	 * @return void|IXR_Error
+	 */
+	private function _toggle_sticky( $post_data, $update = false ) {
+		$post_type = get_post_type_object( $post_data['post_type'] );
+		// Private and password-protected posts cannot be stickied.
+		if ( 'private' === $post_data['post_status'] || ! empty( $post_data['post_password'] ) ) {
+			// Error if the client tried to stick the post, otherwise, silently unstick.
+			if ( ! empty( $post_data['sticky'] ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
+			}
+			if ( $update ) {
+				unstick_post( $post_data['ID'] );
+			}
+		} elseif ( isset( $post_data['sticky'] ) )  {
+			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you are not allowed to make posts sticky.' ) );
+			}
+			$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
-	 * @uses wp_insert_post()
+	 *
-	 *
+	 * @see wp_insert_post()
-	 * @param WP_User $user The post author if post_author isn't set in $content_struct.
+	 *
+	 * @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,
+		$defaults = array(
-			'post_password' => '', 'post_excerpt' => '', 'post_content' => '', 'post_title' => '' );
+			'post_status'    => 'draft',
+			'post_type'      => 'post',
-		$post_data = wp_parse_args( $content_struct, $defaults );
+			'post_author'    => null,
+			'post_password'  => null,
+			'post_excerpt'   => null,
+			'post_content'   => null,
+			'post_title'     => null,
+			'post_date'      => null,
+			'post_date_gmt'  => null,
+			'post_format'    => null,
+			'post_name'      => null,
+			'post_thumbnail' => null,
+			'post_parent'    => null,
+			'ping_status'    => null,
+			'comment_status' => null,
+			'custom_fields'  => null,
+			'terms_names'    => null,
+			'terms'          => null,
+			'sticky'         => null,
+			'enclosure'      => null,
+			'ID'             => null,
+		);
+		$post_data = wp_parse_args( array_intersect_key( $content_struct, $defaults ), $defaults );
 		$post_type = get_post_type_object( $post_data['post_type'] );
 		if ( ! $post_type )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+			return new IXR_Error( 403, __( 'Invalid post type.' ) );
 		$update = ! empty( $post_data['ID'] );
 		if ( $update ) {
 			if ( ! get_post( $post_data['ID'] ) )
 			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' ) );
+					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' ) );
+					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' ) );
+			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.' ) );
+				return new IXR_Error( 401, __( 'Sorry, 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.' ) );
 			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
+		// 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
+			// 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();
 		}
+		// Default to not flagging the post date to be edited unless it's intentional.
+		$post_data['edit_date'] = false;
 		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' );
+			// Flag the post date to be edited.
+			$post_data['edit_date'] = true;
 		}
 		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' ) {
-			// Private and password-protected posts cannot be stickied.
+			$error = $this->_toggle_sticky( $post_data, $update );
-			if ( $post_data['post_status'] == 'private' || ! empty( $post_data['post_password'] ) ) {
+			if ( $error ) {
-				// Error if the client tried to stick the post, otherwise, silently unstick.
+				return $error;
-				if ( ! empty( $post_data['sticky'] ) )
-					return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
-				if ( $update )
-					unstick_post( $post_ID );
-			} elseif ( isset( $post_data['sticky'] ) )  {
-				if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
-				if ( $post_data['sticky'] )
-					stick_post( $post_ID );
-				else
-					unstick_post( $post_ID );
 			}
 		}
 		if ( isset( $post_data['post_thumbnail'] ) ) {
-			// empty value deletes, non-empty value adds/updates
+			// 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'] );
 			$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
+			// Accumulate term IDs from terms and terms_names.
 			$terms = array();
-			// first validate the terms specified by ID
+			// 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
+				// 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 ) )
 					$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' ) );
+							return new IXR_Error( 403, __( 'Invalid term ID.' ) );
 						$terms[$taxonomy][] = (int) $term_id;
 					}
 				}
 			}
-			// now validate terms specified by name
+			// 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
+					/*
+					 * 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
+						// 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
+						// 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 );
 					}
 							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
+							// 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
+							// 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'];
 				}
 			}
 			$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'] );
 				return new IXR_Error( 500, $format->get_error_message() );
 			unset( $post_data['post_format'] );
 		}
-		// Handle enclosures
+		// 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.
+		 * Filters 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_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 new IXR_Error( 401, __( 'Sorry, your entry could not be posted.' ) );
 		return strval( $post_ID );
 	}
 	/**
 	 * 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 parameters. Contains:
+	 * @param array  $args {
-	 *  - int     $blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $username
+	 *
-	 *  - string  $password
+	 *     @type int    $blog_id        Blog ID (unused).
-	 *  - int     $post_id
+	 *     @type string $username       Username.
-	 *  - array   $content_struct
+	 *     @type string $password       Password.
-	 * @return bool|IXR_Error true on success
+	 *     @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;
 			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
+		// 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
+		 * 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'] );
 	/**
 	 * Delete a post for any registered post type.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses wp_delete_post()
+	 * @see wp_delete_post()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - int     $post_id
+	 *     @type int    $blog_id  Blog ID (unused).
-	 * @return bool|IXR_Error true on success
+	 *     @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 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'] ) )
+		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
-		if ( ! current_user_can( 'delete_post', $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 )
+		if ( ! $result ) {
 			return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+		}
 		return true;
 	}
 	/**
 	 * 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'.
 	 *
-	 * @uses get_post()
+	 * @see get_post()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - int     $post_id
+	 *     @type int    $blog_id  Blog ID (unused).
-	 *  - array   $fields optional
+	 *     @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'
 		if ( ! $this->minimum_args( $args, 4 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username           = $args[1];
+		$username = $args[1];
-		$password           = $args[2];
+		$password = $args[2];
-		$post_id            = (int) $args[3];
+		$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.
+			 * Filters the list of post query fields used by the given XML-RPC method.
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param array $fields  Array of post fields.
+			 * @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 ( 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 new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		return $this->_prepare_post( $post, $fields );
 	}
 	/**
 	 * Retrieve posts.
 	 *
 	 * @since 3.4.0
 	 *
-	 * The optional $filter parameter modifies the query used to retrieve posts.
+	 * @see wp_get_recent_posts()
-	 * Accepted keys are 'post_type', 'post_status', 'number', 'offset',
+	 * @see wp_getPost() for more on `$fields`
-	 * 'orderby', and 'order'.
+	 * @see get_posts() for more on `$filter` values
 	 *
-	 * The optional $fields parameter specifies what fields will be included
+	 * @param array $args {
-	 * in the response array.
+	 *     Method arguments. Note: arguments must be ordered as documented.
 	 *
-	 * @uses wp_get_recent_posts()
+	 *     @type int    $blog_id  Blog ID (unused).
-	 * @see wp_getPost() for more on $fields
+	 *     @type string $username Username.
-	 * @see get_posts() for more on $filter values
+	 *     @type string $password Password.
-	 *
+	 *     @type array  $filter   Optional. Modifies the query used to retrieve posts. Accepts 'post_type',
-	 * @param array $args Method parameters. Contains:
+	 *                            'post_status', 'number', 'offset', 'orderby', 's', and 'order'.
-	 *  - int     $blog_id (unused)
+	 *                            Default empty array.
-	 *  - string  $username
+	 *     @type array  $fields   Optional. The subset of post type fields to return in the response array.
-	 *  - string  $password
+	 * }
-	 *  - array   $filter optional
-	 *  - array   $fields optional
 	 * @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];
+		$username = $args[1];
-		$password   = $args[2];
+		$password = $args[2];
-		$filter     = isset( $args[3] ) ? $args[3] : array();
+		$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 */
 		$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' ) );
+				return new IXR_Error( 403, __( 'Invalid post type.' ) );
 		} 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' ));
+			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'];
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list )
 			return array();
-		// holds all the posts data
+		// Holds all the posts data.
 		$struct = array();
 		foreach ( $posts_list as $post ) {
 			if ( ! current_user_can( 'edit_post', $post['ID'] ) )
 				continue;
 	/**
 	 * Create a new term.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses wp_insert_term()
+	 * @see wp_insert_term()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - array   $content_struct
+	 *     @type int    $blog_id        Blog ID (unused).
-	 *      The $content_struct must contain:
+	 *     @type string $username       Username.
-	 *      - 'name'
+	 *     @type string $password       Password.
-	 *      - 'taxonomy'
+	 *     @type array  $content_struct Content struct for adding a new term. The struct must contain
-	 *      Also, it can optionally contain:
+	 *                                  the term 'name' and 'taxonomy'. Optional accepted values include
-	 *      - 'parent'
+	 *                                  'parent', 'description', and 'slug'.
-	 *      - 'description'
+	 * }
-	 *      - 'slug'
+	 * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
-	 * @return string|IXR_Error term_id
 	 */
 	public function wp_newTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username           = $args[1];
+		$username       = $args[1];
-		$password           = $args[2];
+		$password       = $args[2];
-		$content_struct     = $args[3];
+		$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' ) );
+			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
-		if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
+		if ( ! current_user_can( $taxonomy->cap->edit_terms ) ) {
-			return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) );
+		}
 		$taxonomy = (array) $taxonomy;
 		// hold the data of the term
 		$term_data = array();
 		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 new IXR_Error( 500, __( 'Sorry, your term could not be created.' ) );
+		// Add term meta.
+		if ( isset( $content_struct['custom_fields'] ) ) {
+			$this->set_term_custom_fields( $term['term_id'], $content_struct['custom_fields'] );
+		}
 		return strval( $term['term_id'] );
 	}
 	/**
 	 * Edit a term.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses wp_update_term()
+	 * @see wp_update_term()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $term_id
+	 *     @type int    $blog_id        Blog ID (unused).
-	 *  - array   $content_struct
+	 *     @type string $username       Username.
-	 *      The $content_struct must contain:
+	 *     @type string $password       Password.
-	 *      - 'taxonomy'
+	 *     @type int    $term_id        Term ID.
-	 *      Also, it can optionally contain:
+	 *     @type array  $content_struct Content struct for editing a term. The struct must contain the
-	 *      - 'name'
+	 *                                  term ''taxonomy'. Optional accepted values include 'name', 'parent',
-	 *      - 'parent'
+	 *                                  'description', and 'slug'.
-	 *      - 'description'
+	 * }
-	 *      - 'slug'
+	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
-	 * @return bool|IXR_Error True, on success.
 	 */
 	public function wp_editTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 5 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username           = $args[1];
+		$username       = $args[1];
-		$password           = $args[2];
+		$password       = $args[2];
-		$term_id            = (int) $args[3];
+		$term_id        = (int) $args[3];
-		$content_struct     = $args[4];
+		$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' ) );
+			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();
 		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 new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		if ( ! current_user_can( 'edit_term', $term_id ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this term.' ) );
+		}
 		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 ( ! empty( $content_struct['parent'] ) ) {
 			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+				return new IXR_Error( 403, __( 'Cannot set parent term, 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, $term->get_error_message() );
 		if ( ! $term )
 			return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+		// Update term meta.
+		if ( isset( $content_struct['custom_fields'] ) ) {
+			$this->set_term_custom_fields( $term_id, $content_struct['custom_fields'] );
+		}
 		return true;
 	}
 	/**
 	 * Delete a term.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses wp_delete_term()
+	 * @see wp_delete_term()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $taxnomy_name
+	 *     @type int    $blog_id      Blog ID (unused).
-	 *  - string     $term_id
+	 *     @type string $username     Username.
-	 * @return boolean|IXR_Error If it suceeded true else a reason why not
+	 *     @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 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' ) );
+			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' ) );
+			return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		if ( ! current_user_can( 'delete_term', $term_id ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this term.' ) );
+		}
 		$result = wp_delete_term( $term_id, $taxonomy->name );
 		if ( is_wp_error( $result ) )
 			return new IXR_Error( 500, $term->get_error_message() );
 	/**
 	 * Retrieve a term.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses get_term()
+	 * @see get_term()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $taxonomy
+	 *     @type int    $blog_id  Blog ID (unused).
-	 *  - string  $term_id
+	 *     @type string $username Username.
-	 * @return array|IXR_Error Array contains:
+	 *     @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'
 		/** 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' ) );
+			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 new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		if ( ! current_user_can( 'assign_term', $term_id ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign this term.' ) );
+		}
 		return $this->_prepare_term( $term );
 	}
 	/**
 	 * @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'.
 	 *
-	 * @uses get_terms()
+	 * @see get_terms()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $taxonomy
+	 *     @type int    $blog_id  Blog ID (unused).
-	 *  - array   $filter optional
+	 *     @type string $username Username.
-	 * @return array|IXR_Error terms
+	 *     @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 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' ) );
+			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 new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
 		$query = array();
 		if ( isset( $filter['number'] ) )
 			$query['number'] = absint( $filter['number'] );
 	/**
 	 * Retrieve a taxonomy.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses get_taxonomy()
+	 * @see get_taxonomy()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $taxonomy
+	 *     @type int    $blog_id  Blog ID (unused).
-	 * @return array|IXR_Error (@see get_taxonomy())
+	 *     @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];
+		$username = $args[1];
-		$password       = $args[2];
+		$password = $args[2];
-		$taxonomy       = $args[3];
+		$taxonomy = $args[3];
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
 		} else {
 			/**
-			 * Filter the taxonomy query fields used by the given XML-RPC method.
+			 * Filters 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.
 		/** 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' ) );
+			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 new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
 		return $this->_prepare_taxonomy( $taxonomy, $fields );
 	}
 	/**
 	 * Retrieve all taxonomies.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses get_taxonomies()
+	 * @see get_taxonomies()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 * @return array taxonomies
+	 *     @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];
+		$username = $args[1];
-		$password           = $args[2];
+		$password = $args[2];
-		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+		$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 */
 	 * 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 parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - int     $user_id
+	 *     @type int    $blog_id (unused)
-	 *  - array   $fields optional
+	 *     @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'
 		if ( ! $this->minimum_args( $args, 4 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username   = $args[1];
+		$username = $args[1];
-		$password   = $args[2];
+		$password = $args[2];
-		$user_id    = (int) $args[3];
+		$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.
+			 * Filters 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.
 		/** 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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this user.' ) );
 		$user_data = get_userdata( $user_id );
 		if ( ! $user_data )
-			return new IXR_Error( 404, __( 'Invalid user ID' ) );
+			return new IXR_Error( 404, __( 'Invalid user ID.' ) );
 		return $this->_prepare_user( $user_data, $fields );
 	}
 	/**
 	 * in the response array.
 	 *
 	 * @uses get_users()
 	 * @see wp_getUser() for more on $fields and return values
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - int     $blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $username
+	 *
-	 *  - string  $password
+	 *     @type int    $blog_id (unused)
-	 *  - array   $filter optional
+	 *     @type string $username
-	 *  - array   $fields optional
+	 *     @type string $password
+	 *     @type array  $filter (optional)
+	 *     @type array  $fields (optional)
+	 * }
 	 * @return array|IXR_Error users data
 	 */
 	public function wp_getUsers( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username   = $args[1];
+		$username = $args[1];
-		$password   = $args[2];
+		$password = $args[2];
-		$filter     = isset( $args[3] ) ? $args[3] : array();
+		$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 */
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getUsers' );
 		if ( ! current_user_can( 'list_users' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to list users.' ) );
 		$query = array( 'fields' => 'all_with_meta' );
 		$query['number'] = ( isset( $filter['number'] ) ) ? absint( $filter['number'] ) : 50;
 		$query['offset'] = ( isset( $filter['offset'] ) ) ? absint( $filter['offset'] ) : 0;
 				$query['order'] = $filter['order'];
 		}
 		if ( isset( $filter['role'] ) ) {
 			if ( get_role( $filter['role'] ) === null )
-				return new IXR_Error( 403, __( 'The role specified is not valid' ) );
+				return new IXR_Error( 403, __( 'Invalid role.' ) );
 			$query['role'] = $filter['role'];
 		}
 		if ( isset( $filter['who'] ) ) {
 	/**
 	 * Retrieve information about the requesting user.
 	 *
 	 * @uses get_userdata()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - array   $fields optional
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $fields (optional)
+	 * }
 	 * @return array|IXR_Error (@see wp_getUser)
 	 */
 	public function wp_getProfile( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
 			return $this->error;
 		$this->escape( $args );
-		$username   = $args[1];
+		$username = $args[1];
-		$password   = $args[2];
+		$password = $args[2];
 		if ( isset( $args[3] ) ) {
 			$fields = $args[3];
 		} else {
 			/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		/** 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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
 		$user_data = get_userdata( $user->ID );
 		return $this->_prepare_user( $user_data, $fields );
 	}
 	/**
 	 * Edit user's profile.
 	 *
 	 * @uses wp_update_user()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - array   $content_struct
+	 *     @type int    $blog_id (unused)
-	 *      It can optionally contain:
+	 *     @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 bool|IXR_Error True, on success.
+	 * }
+	 * @return true|IXR_Error True, on success.
 	 */
 	public function wp_editProfile( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
 			return $this->error;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editProfile' );
 		if ( ! current_user_can( 'edit_user', $user->ID ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit your profile.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
 		// holds data of the user
 		$user_data = array();
 		$user_data['ID'] = $user->ID;
 	/**
 	 * Retrieve page.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - page_id
+	 *
-	 *  - username
+	 *     @type int    $blog_id (unused)
-	 *  - password
+	 *     @type int    $page_id
+	 *     @type string $username
+	 *     @type string $password
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPage($args) {
+	public function wp_getPage( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
-		$page_id	= (int) $args[1];
+		$page_id  = (int) $args[1];
-		$username	= $args[2];
+		$username = $args[2];
-		$password	= $args[3];
+		$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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
 		/** 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.
 	/**
 	 * Retrieve Pages.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - num_pages
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $num_pages
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getPages($args) {
+	public function wp_getPages( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
-		$username	= $args[1];
+		$username  = $args[1];
-		$password	= $args[2];
+		$password  = $args[2];
-		$num_pages	= isset($args[3]) ? (int) $args[3] : 10;
+		$num_pages = isset($args[3]) ? (int) $args[3] : 10;
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
 		/** 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) );
 	/**
 	 * Create new page.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters. See {@link wp_xmlrpc_server::mw_newPost()}
+	 * @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
 	 */
-	public function wp_newPage($args) {
+	public function wp_newPage( $args ) {
 		// Items not escaped here will be escaped in newPost.
-		$username	= $this->escape($args[1]);
+		$username = $this->escape( $args[1] );
-		$password	= $this->escape($args[2]);
+		$password = $this->escape( $args[2] );
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 	/**
 	 * Delete page.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return bool|IXR_Error True, if success.
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function wp_deletePage($args) {
+	 *     @type int    $blog_id (unused)
-		$this->escape($args);
+	 *     @type string $username
+	 *     @type string $password
-		$username	= $args[1];
+	 *     @type int    $page_id
-		$password	= $args[2];
+	 * }
-		$page_id	= (int) $args[3];
+	 * @return true|IXR_Error True, if success.
+	 */
+	public function wp_deletePage( $args ) {
+		$this->escape( $args );
+		$username = $args[1];
+		$password = $args[2];
+		$page_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 */
 		if ( !$actual_page || ($actual_page['post_type'] != '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 are not allowed 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.' ) );
 	/**
 	 * Edit page.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function wp_editPage($args) {
+	public function wp_editPage( $args ) {
-		// Items not escaped here will be escaped in editPost.
+		// Items will be escaped in mw_editPost.
-		$page_id	= (int) $this->escape($args[1]);
+		$page_id  = (int) $args[1];
-		$username	= $this->escape($args[2]);
+		$username = $args[2];
-		$password	= $this->escape($args[3]);
+		$password = $args[3];
-		$content	= $args[4];
+		$content  = $args[4];
-		$publish	= $args[5];
+		$publish  = $args[5];
-		if ( !$user = $this->login($username, $password) )
+		$escaped_username = $this->escape( $username );
-			return $this->error;
+		$escaped_password = $this->escape( $password );
+		if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
+			return $this->error;
+		}
 		/** 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.
 		if ( !$actual_page || ($actual_page['post_type'] != '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 are not allowed to edit this page.' ) );
 		// Mark this as content for a page.
 		$content['post_type'] = 'page';
 		// Arrange args in the way mw_editPost understands.
 	/**
 	 * Retrieve page list.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @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
 	 */
-	public function wp_getPageList($args) {
+	public function wp_getPageList( $args ) {
 		global $wpdb;
-		$this->escape($args);
+		$this->escape( $args );
-		$username				= $args[1];
+		$username = $args[1];
-		$password				= $args[2];
+		$password = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
 		/** 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
 	/**
 	 * Retrieve authors list.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function wp_getAuthors($args) {
+	public function wp_getAuthors( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$username = $args[1];
-		$username	= $args[1];
+		$password = $args[2];
-		$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 are not allowed to edit posts.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getAuthors' );
 		$authors = array();
 	/**
 	 * Get list of all tags
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getTags( $args ) {
 		$this->escape( $args );
-		$username		= $args[1];
+		$username = $args[1];
-		$password		= $args[2];
+		$password = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_posts' ) )
 		do_action( 'xmlrpc_call', 'wp.getKeywords' );
 		$tags = array();
 		if ( $all_tags = get_tags() ) {
-			foreach( (array) $all_tags as $tag ) {
+			foreach ( (array) $all_tags as $tag ) {
 				$struct = array();
 				$struct['tag_id']			= $tag->term_id;
 				$struct['name']				= $tag->name;
 				$struct['count']			= $tag->count;
 				$struct['slug']				= $tag->slug;
 	/**
 	 * Create new category.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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.
 	 */
-	public function wp_newCategory($args) {
+	public function wp_newCategory( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
-		$username				= $args[1];
+		$username = $args[1];
-		$password				= $args[2];
+		$password = $args[2];
-		$category				= $args[3];
+		$category = $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.newCategory' );
 		// Make sure the user is allowed to add a category.
-		if ( !current_user_can('manage_categories') )
+		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 are not allowed to add a category.' ) );
+		}
 		// If no slug was provided make it empty so that
 		// WordPress will generate one.
 		if ( empty($category['slug']) )
 			$category['slug'] = '';
 	/**
 	 * Remove category.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return bool|IXR_Error See {@link wp_delete_term()} for return info.
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function wp_deleteCategory($args) {
+	 *     @type int    $blog_id (unused)
-		$this->escape($args);
+	 *     @type string $username
+	 *     @type string $password
-		$username		= $args[1];
+	 *     @type int    $category_id
-		$password		= $args[2];
+	 * }
-		$category_id	= (int) $args[3];
+	 * @return bool|IXR_Error See wp_delete_term() for return info.
+	 */
+	public function wp_deleteCategory( $args ) {
+		$this->escape( $args );
+		$username    = $args[1];
+		$password    = $args[2];
+		$category_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.deleteCategory' );
-		if ( !current_user_can('manage_categories') )
+		if ( ! current_user_can( 'delete_term', $category_id ) ) {
-			return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this category.' ) );
+		}
 		$status = wp_delete_term( $category_id, 'category' );
 		if ( true == $status ) {
 			/**
 	/**
 	 * Retrieve category list.
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function wp_suggestCategories($args) {
+	public function wp_suggestCategories( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
-		$username				= $args[1];
+		$username    = $args[1];
-		$password				= $args[2];
+		$password    = $args[2];
-		$category				= $args[3];
+		$category    = $args[3];
-		$max_results			= (int) $args[4];
+		$max_results = (int) $args[4];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_posts' ) )
 	/**
 	 * Retrieve comment.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getComment($args) {
 		$this->escape($args);
 		$username	= $args[1];
 		$password	= $args[2];
 		$comment_id	= (int) $args[3];
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getComment' );
-		if ( ! $comment = get_comment($comment_id) )
+		if ( ! $comment = 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, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
+		}
 		return $this->_prepare_comment( $comment );
 	}
 	/**
 	 *
 	 * The defaults are as follows:
 	 * - 'status' - Default is ''. Filter by status (e.g., 'approve', 'hold')
 	 * - 'post_id' - Default is ''. The post where the comment is posted. Empty string shows all comments.
 	 * - 'number' - Default is 10. 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.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return array|IXR_Error Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function wp_getComments($args) {
+	 *     @type int    $blog_id (unused)
-		$this->escape($args);
+	 *     @type string $username
+	 *     @type string $password
-		$username	= $args[1];
+	 *     @type array  $struct
-		$password	= $args[2];
+	 * }
-		$struct		= isset( $args[3] ) ? $args[3] : array();
+	 * @return array|IXR_Error Contains a collection of comments. See wp_xmlrpc_server::wp_getComment() for a description of each item contents
+	 */
-		if ( !$user = $this->login($username, $password) )
+	public function wp_getComments( $args ) {
-			return $this->error;
+		$this->escape( $args );
-		if ( !current_user_can( 'moderate_comments' ) )
+		$username = $args[1];
-			return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
+		$password = $args[2];
+		$struct	  = isset( $args[3] ) ? $args[3] : 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.getComments' );
-		if ( isset($struct['status']) )
+		if ( isset( $struct['status'] ) ) {
 			$status = $struct['status'];
-		else
+		} else {
 			$status = '';
+		}
+		if ( ! current_user_can( 'moderate_comments' ) && 'approve' !== $status ) {
+			return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+		}
 		$post_id = '';
-		if ( isset($struct['post_id']) )
+		if ( isset( $struct['post_id'] ) ) {
-			$post_id = absint($struct['post_id']);
+			$post_id = absint( $struct['post_id'] );
+		}
+		$post_type = '';
+		if ( isset( $struct['post_type'] ) ) {
+			$post_type_object = get_post_type_object( $struct['post_type'] );
+			if ( ! $post_type_object || ! post_type_supports( $post_type_object->name, 'comments' ) ) {
+				return new IXR_Error( 404, __( 'Invalid post type.' ) );
+			}
+			$post_type = $struct['post_type'];
+		}
 		$offset = 0;
-		if ( isset($struct['offset']) )
+		if ( isset( $struct['offset'] ) ) {
-			$offset = absint($struct['offset']);
+			$offset = absint( $struct['offset'] );
+		}
 		$number = 10;
-		if ( isset($struct['number']) )
+		if ( isset( $struct['number'] ) ) {
-			$number = absint($struct['number']);
+			$number = absint( $struct['number'] );
+		}
-		$comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
+		$comments = get_comments( array(
+			'status' => $status,
+			'post_id' => $post_id,
+			'offset' => $offset,
+			'number' => $number,
+			'post_type' => $post_type,
+		) );
 		$comments_struct = array();
+		if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
+			foreach ( $comments as $comment ) {
-			$comments_struct[] = $this->_prepare_comment( $comment );
+				$comments_struct[] = $this->_prepare_comment( $comment );
+			}
 		}
 		return $comments_struct;
 	}
 	/**
 	 * Delete a comment.
 	 *
 	 * By default, the comment will be moved to the trash instead of deleted.
-	 * See {@link wp_delete_comment()} for more information on
+	 * See wp_delete_comment() for more information on this behavior.
-	 * this behavior.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - comment_id
+	 *     @type string $username
-	 * @return bool|IXR_Error {@link wp_delete_comment()}
+	 *     @type string $password
-	 */
+	 *     @type int    $comment_ID
-	public function wp_deleteComment($args) {
+	 * }
+	 * @return bool|IXR_Error See wp_delete_comment().
+	 */
+	public function wp_deleteComment( $args ) {
 		$this->escape($args);
 		$username	= $args[1];
 		$password	= $args[2];
 		$comment_ID	= (int) $args[3];
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
-		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 ) ) {
-		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.' ) );
+		if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed to delete this comment.' ) );
+		}
 		/** 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 ( true == $status ) {
+		if ( $status ) {
 			/**
 			 * Fires after a comment has been successfully deleted via XML-RPC.
 			 *
 			 * @since 3.4.0
 			 *
 	 *  - 'author'
 	 *  - 'author_url'
 	 *  - '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:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - comment_id
+	 *     @type string $username
-	 *  - content_struct
+	 *     @type string $password
-	 * @return bool|IXR_Error True, on success.
+	 *     @type int    $comment_ID
-	 */
+	 *     @type array  $content_struct
-	public function wp_editComment($args) {
+	 * }
-		$this->escape($args);
+	 * @return true|IXR_Error True, on success.
+	 */
+	public function wp_editComment( $args ) {
+		$this->escape( $args );
 		$username	= $args[1];
 		$password	= $args[2];
 		$comment_ID	= (int) $args[3];
 		$content_struct = $args[4];
-		if ( !$user = $this->login($username, $password) )
+		if ( !$user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
-		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 ) ) {
-		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.' ) );
+		if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
+		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editComment' );
 		if ( isset($content_struct['status']) ) {
 		$result = wp_update_comment($comment);
 		if ( is_wp_error( $result ) )
 			return new IXR_Error(500, $result->get_error_message());
 		if ( !$result )
-			return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
+			return new IXR_Error(500, __('Sorry, the comment could not be edited.'));
 		/**
 		 * Fires after a comment has been successfully updated via XML-RPC.
 		 *
 		 * @since 3.4.0
 	/**
 	 * Create new comment.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return int|IXR_Error {@link wp_new_comment()}
+	 *     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 See wp_new_comment().
 	 */
 	public function wp_newComment($args) {
 		$this->escape($args);
-		$username	= $args[1];
+		$username       = $args[1];
-		$password	= $args[2];
+		$password       = $args[2];
-		$post		= $args[3];
+		$post           = $args[3];
 		$content_struct = $args[4];
 		/**
-		 * Filter whether to allow anonymous comments over XML-RPC.
+		 * Filters 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.
 		$user = $this->login($username, $password);
 		if ( !$user ) {
 			$logged_in = false;
 			if ( $allow_anon && get_option('comment_registration') ) {
-				return new IXR_Error( 403, __( 'You must be registered to comment' ) );
+				return new IXR_Error( 403, __( 'You must be registered to comment.' ) );
 			} elseif ( ! $allow_anon ) {
 				return $this->error;
 			}
 		} else {
 			$logged_in = true;
 		if ( is_numeric($post) )
 			$post_id = absint($post);
 		else
 			$post_id = url_to_postid($post);
-		if ( ! $post_id )
+		if ( ! $post_id ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
-		if ( ! get_post($post_id) )
+		if ( ! get_post( $post_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
-		$comment = array();
-		$comment['comment_post_ID'] = $post_id;
+		if ( ! comments_open( $post_id ) ) {
+			return new IXR_Error( 403, __( 'Sorry, comments are closed for this item.' ) );
+		}
+		if ( empty( $content_struct['content'] ) ) {
+			return new IXR_Error( 403, __( 'Comment is required.' ) );
+		}
+		$comment = array(
+			'comment_post_ID' => $post_id,
+			'comment_content' => $content_struct['content'],
+		);
 		if ( $logged_in ) {
-			$comment['comment_author'] = $this->escape( $user->display_name );
+			$display_name = $user->display_name;
-			$comment['comment_author_email'] = $this->escape( $user->user_email );
+			$user_email = $user->user_email;
-			$comment['comment_author_url'] = $this->escape( $user->user_url );
+			$user_url = $user->user_url;
+			$comment['comment_author'] = $this->escape( $display_name );
+			$comment['comment_author_email'] = $this->escape( $user_email );
+			$comment['comment_author_url'] = $this->escape( $user_url );
 			$comment['user_ID'] = $user->ID;
 		} else {
 			$comment['comment_author'] = '';
 			if ( isset($content_struct['author']) )
 				$comment['comment_author'] = $content_struct['author'];
 			$comment['user_ID'] = 0;
 			if ( get_option('require_name_email') ) {
 				if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
-					return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
+					return new IXR_Error( 403, __( 'Comment author name and email are required.' ) );
 				elseif ( !is_email($comment['comment_author_email']) )
-					return new IXR_Error( 403, __( 'A valid email address is required' ) );
+					return new IXR_Error( 403, __( 'A valid email address is required.' ) );
 			}
 		}
 		$comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
-		$comment['comment_content'] =  isset($content_struct['content']) ? $content_struct['content'] : null;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newComment' );
-		$comment_ID = wp_new_comment( $comment );
+		$comment_ID = wp_new_comment( $comment, true );
+		if ( is_wp_error( $comment_ID ) ) {
+			return new IXR_Error( 403, $comment_ID->get_error_message() );
+		}
+		if ( ! $comment_ID ) {
+			return new IXR_Error( 403, __( 'Something went wrong.' ) );
+		}
 		/**
 		 * Fires after a new comment has been successfully created via XML-RPC.
 		 *
 		 * @since 3.4.0
 	/**
 	 * Retrieve all of the comment status.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function wp_getCommentStatusList($args) {
+	public function wp_getCommentStatusList( $args ) {
 		$this->escape( $args );
-		$username	= $args[1];
+		$username = $args[1];
-		$password	= $args[2];
+		$password = $args[2];
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
-		if ( !current_user_can( 'moderate_comments' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+		if ( ! current_user_can( 'publish_posts' ) ) {
+			return new IXR_Error( 403, __( 'Sorry, 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.getCommentStatusList' );
 		return get_comment_statuses();
 	/**
 	 * Retrieve comment count.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getCommentCount( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
 		$username	= $args[1];
 		$password	= $args[2];
 		$post_id	= (int) $args[3];
-		if ( !$user = $this->login($username, $password) )
+		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 comments.' ) );
+		$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( 403, __( 'Sorry, you are not allowed access to details of this post.' ) );
+		}
 		/** 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(
 			'approved' => $count->approved,
 			'awaiting_moderation' => $count->moderated,
 			'spam' => $count->spam,
 			'total_comments' => $count->total_comments
 	/**
 	 * Retrieve post statuses.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getPostStatusList( $args ) {
 		$this->escape( $args );
-		$username	= $args[1];
+		$username = $args[1];
-		$password	= $args[2];
+		$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.' ) );
+			return new IXR_Error( 403, __( 'Sorry, 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.getPostStatusList' );
 		return get_post_statuses();
 	/**
 	 * Retrieve page statuses.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getPageStatusList( $args ) {
 		$this->escape( $args );
-		$username	= $args[1];
+		$username = $args[1];
-		$password	= $args[2];
+		$password = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+			return new IXR_Error( 403, __( 'Sorry, 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.getPageStatusList' );
 		return get_page_statuses();
 	/**
 	 * Retrieve page templates.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getPageTemplates( $args ) {
 		$this->escape( $args );
-		$username	= $args[1];
+		$username = $args[1];
-		$password	= $args[2];
+		$password = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_pages' ) )
-			return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
 		$templates = get_page_templates();
 		$templates['Default'] = 'default';
 		return $templates;
 	/**
 	 * Retrieve blog options.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_getOptions( $args ) {
 		$this->escape( $args );
 	/**
 	 * Update blog options.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function wp_setOptions( $args ) {
 		$this->escape( $args );
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'manage_options' ) )
-			return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
+			return new IXR_Error( 403, __( 'Sorry, 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 ) )
 	/**
 	 * Retrieve a media item by ID
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - attachment_id
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $attachment_id
+	 * }
 	 * @return array|IXR_Error Associative array contains:
 	 *  - 'date_created_gmt'
 	 *  - 'parent'
 	 *  - 'link'
 	 *  - 'thumbnail'
 	 *  - 'title'
 	 *  - 'caption'
 	 *  - 'description'
 	 *  - 'metadata'
 	 */
-	public function wp_getMediaItem($args) {
+	public function wp_getMediaItem( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
 		$username		= $args[1];
 		$password		= $args[2];
 		$attachment_id	= (int) $args[3];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed to upload files.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getMediaItem' );
 		if ( ! $attachment = get_post($attachment_id) )
 	 *
 	 * 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:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - filter
+	 *     @type string $username
-	 * @return array|IXR_Error Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents
+	 *     @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
 	 */
 	public function wp_getMediaLibrary($args) {
 		$this->escape($args);
 		$username	= $args[1];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'upload_files' ) )
-			return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
 		/** 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']) : '' ;
 		return $attachments_struct;
 	}
 	/**
-	  * Retrieves a list of post formats used by the site
+	 * Retrieves a list of post formats used by the site.
-	  *
+	 *
-	  * @since 3.1.0
+	 * @since 3.1.0
-	  *
+	 *
-	  * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	  *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	  *  - username
+	 *
-	  *  - password
+	 *     @type int    $blog_id (unused)
-	  * @return array|IXR_Error
+	 *     @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 );
 		$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.' ) );
+			return new IXR_Error( 403, __( 'Sorry, 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();
 	/**
 	 * Retrieves a post type
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses get_post_type_object()
+	 * @see get_post_type_object()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - string  $post_type_name
+	 *     @type int    $blog_id (unused)
-	 *  - array   $fields
+	 *     @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'
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
 		} else {
 			/**
-			 * Filter the default query fields used by the given XML-RPC method.
+			 * Filters 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.
 			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 ) )
+		if ( ! post_type_exists( $post_type_name ) )
-			return new IXR_Error( 403, __( 'Invalid post type' ) );
+			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 ) )
+		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 new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
 		return $this->_prepare_post_type( $post_type, $fields );
 	}
 	/**
 	 * Retrieves a post types
 	 *
 	 * @since 3.4.0
 	 *
-	 * @uses get_post_types()
+	 * @see get_post_types()
-	 * @param array $args Method parameters. Contains:
+	 *
-	 *  - int     $blog_id (unused)
+	 * @param array  $args {
-	 *  - string  $username
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $password
+	 *
-	 *  - array   $filter
+	 *     @type int    $blog_id (unused)
-	 *  - array   $fields
+	 *     @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];
+		$username = $args[1];
-		$password           = $args[2];
+		$password = $args[2];
-		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+		$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 */
 		$post_types = get_post_types( $filter, 'objects' );
 		$struct = array();
-		foreach( $post_types as $post_type ) {
+		foreach ( $post_types as $post_type ) {
-			if( ! current_user_can( $post_type->cap->edit_posts ) )
+			if ( ! current_user_can( $post_type->cap->edit_posts ) )
 				continue;
 			$struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
 		}
 	 * in the response array.
 	 *
 	 * @uses wp_get_post_revisions()
 	 * @see wp_getPost() for more on $fields
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - int     $blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $username
+	 *
-	 *  - string  $password
+	 *     @type int    $blog_id (unused)
-	 *  - int     $post_id
+	 *     @type string $username
-	 *  - array   $fields
+	 *     @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];
+		$username = $args[1];
-		$password   = $args[2];
+		$password = $args[2];
-		$post_id    = (int) $args[3];
+		$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.
+			 * Filters 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.
 		/** 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' ) );
+			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.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @uses wp_restore_post_revision()
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - int     $blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - string  $username
+	 *
-	 *  - string  $password
+	 *     @type int    $blog_id (unused)
-	 *  - int     $post_id
+	 *     @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 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' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		if ( wp_is_post_autosave( $revision ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		if ( ! $post = get_post( $revision->post_parent ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		// Check if revisions are disabled.
 		if ( ! wp_revisions_enabled( $post ) )
 			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
 		return (bool) $post;
 	}
 	/* Blogger API functions.
-	 * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/
+	 * specs on http://plant.blogger.com/api and https://groups.yahoo.com/group/bloggerDev/
 	 */
 	/**
 	 * Retrieve blogs that user owns.
 	 *
 	 * Will make more sense once we support multiple blogs.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
 	public function blogger_getUsersBlogs($args) {
-		if ( is_multisite() )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
+			return $this->error;
+		}
+		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;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 	}
 	/**
 	 * Private function for retrieving a users blogs for multisite setups
 	 *
-	 * @access protected
+	 * @since 3.0.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
 	 */
-	protected function _multisite_getUsersBlogs($args) {
+	protected function _multisite_getUsersBlogs( $args ) {
-		$current_blog = get_blog_details();
+		$current_blog = get_site();
 		$domain = $current_blog->domain;
 		$path = $current_blog->path . 'xmlrpc.php';
 		$rpc = new IXR_Client( set_url_scheme( "http://{$domain}{$path}" ) );
 	 *
 	 * Gives your client some info about you, so you don't have to.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function blogger_getUserInfo($args) {
+	public function blogger_getUserInfo( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
 		$username = $args[1];
-		$password  = $args[2];
+		$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 do not have access to user data on this site.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to access user data on this site.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
 		$struct = array(
 	/**
 	 * Retrieve post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function blogger_getPost($args) {
+	public function blogger_getPost( $args ) {
+		$this->escape( $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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		/** 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));
 	/**
 	 * Retrieve list of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function blogger_getRecentPosts($args) {
+	public function blogger_getRecentPosts( $args ) {
 		$this->escape($args);
 		// $args[0] = appkey - ignored
 		$username = $args[2];
-		$password  = $args[3];
+		$password = $args[3];
 		if ( isset( $args[4] ) )
 			$query = array( 'numberposts' => absint( $args[4] ) );
 		else
 			$query = array();
 		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 are not allowed to edit posts.' ) );
 		/** 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 );
 	/**
 	 * Deprecated.
 	 *
 	 * @since 1.5.0
 	 * @deprecated 3.5.0
-	 * @return IXR_Error
+	 *
+	 * @param array $args Unused.
+	 * @return IXR_Error Error object.
 	 */
 	public function blogger_getTemplate($args) {
 		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
 	}
 	/**
 	 * Deprecated.
 	 *
 	 * @since 1.5.0
 	 * @deprecated 3.5.0
-	 * @return IXR_Error
+	 *
+	 * @param array $args Unused.
+	 * @return IXR_Error Error object.
 	 */
 	public function blogger_setTemplate($args) {
 		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
 	}
 	/**
-	 * Create new post.
+	 * Creates new post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function blogger_newPost($args) {
+	public function blogger_newPost( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
 		$username = $args[2];
-		$password  = $args[3];
+		$password = $args[3];
-		$content    = $args[4];
+		$content  = $args[4];
-		$publish    = $args[5];
+		$publish  = $args[5];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		$post_ID = wp_insert_post($post_data);
 		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.'));
+			return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
 		$this->attach_uploads( $post_ID, $post_content );
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC Blogger API.
 	/**
 	 * Edit a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return bool|IXR_Error true when done.
+	 *     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
+	 *     @type bool   $publish
+	 * }
+	 * @return true|IXR_Error true when done.
 	 */
 	public function blogger_editPost( $args ) {
 		$this->escape($args);
-		$post_ID     = (int) $args[1];
+		$post_ID  = (int) $args[1];
-		$username  = $args[2];
+		$username = $args[2];
-		$password   = $args[3];
+		$password = $args[3];
-		$content     = $args[4];
+		$content  = $args[4];
+		$publish  = $args[5];
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
 		}
 		}
 		$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.'));
+			return new IXR_Error(401, __('Sorry, you are not allowed 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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
 		}
 		$postdata = array();
 		$postdata['ID'] = $actual_post['ID'];
 		$postdata['post_content'] = xmlrpc_removepostdata( $content );
 		$postdata['post_title'] = xmlrpc_getposttitle( $content );
 		$postdata['post_category'] = xmlrpc_getpostcategory( $content );
 		$postdata['post_status'] = $actual_post['post_status'];
 		$postdata['post_excerpt'] = $actual_post['post_excerpt'];
+		$postdata['post_status'] = $publish ? 'publish' : 'draft';
 		$result = wp_update_post( $postdata );
 		if ( ! $result ) {
 			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
 	/**
 	 * Remove a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return bool|IXR_Error True when post is deleted.
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function blogger_deletePost($args) {
+	 *     @type int    $blog_id (unused)
-		$this->escape($args);
+	 *     @type int    $post_ID
+	 *     @type string $username
-		$post_ID     = (int) $args[1];
+	 *     @type string $password
-		$username  = $args[2];
+	 * }
-		$password   = $args[3];
+	 * @return true|IXR_Error True when post is deleted.
+	 */
+	public function blogger_deletePost( $args ) {
+		$this->escape( $args );
+		$post_ID  = (int) $args[1];
+		$username = $args[2];
+		$password = $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', 'blogger.deletePost' );
-		$actual_post = get_post($post_ID,ARRAY_A);
+		$actual_post = get_post( $post_ID, ARRAY_A );
-		if ( !$actual_post || $actual_post['post_type'] != 'post' )
+		if ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
-			return new IXR_Error(404, __('Sorry, no such post.'));
+			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
+		}
-		if ( !current_user_can('delete_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
+		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 )
+		$result = wp_delete_post( $post_ID );
-			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+		if ( ! $result ) {
+			return new IXR_Error( 500, __( 'The post cannot be deleted.' ) );
+		}
 		/**
 		 * Fires after a post has been successfully deleted via the XML-RPC Blogger API.
 		 *
 		 * @since 3.4.0
 	 *  - dateCreated
 	 *  - wp_post_thumbnail
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters. Contains:
+	 * @param array  $args {
-	 *  - blog_id (unused)
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *  - username
+	 *
-	 *  - password
+	 *     @type int    $blog_id (unused)
-	 *  - content_struct
+	 *     @type string $username
-	 *  - publish
+	 *     @type string $password
+	 *     @type array  $content_struct
+	 *     @type int    $publish
+	 * }
 	 * @return int|IXR_Error
 	 */
 	public function mw_newPost($args) {
 		$this->escape($args);
-		$username  = $args[1];
+		$username       = $args[1];
-		$password   = $args[2];
+		$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;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 					$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' ) );
+				return new IXR_Error( 401, __( 'Invalid post type.' ) );
 			}
 		} else {
 			if ( $publish )
 				$cap  = 'publish_posts';
 			elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
 		// Check for a valid post format if one was given
 		if ( isset( $content_struct['wp_post_format'] ) ) {
 			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
 			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-				return new IXR_Error( 404, __( 'Invalid post format' ) );
+				return new IXR_Error( 404, __( 'Invalid post format.' ) );
 			}
 		}
 		// Let WordPress generate the post_name (slug) unless
 		// one has been provided.
 		// If an author id was provided then use it instead.
 		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 create posts as this user.' ) );
+						return new IXR_Error( 401, __( 'Sorry, 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.' ) );
+						return new IXR_Error( 401, __( 'Sorry, you are not allowed to create pages as this user.' ) );
 					break;
 				default:
-					return new IXR_Error( 401, __( 'Invalid post type' ) );
+					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'];
 						break;
 					case 'open':
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			} else {
 				switch ( (int) $content_struct['mt_allow_comments'] ) {
 					case 0:
 						break;
 					case 1:
 						$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']) ) {
 			if ( !is_numeric($content_struct['mt_allow_pings']) ) {
 				switch ( $content_struct['mt_allow_pings'] ) {
 						break;
 					case 'open':
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			} else {
 				switch ( (int) $content_struct['mt_allow_pings'] ) {
 					case 0:
 						break;
 					case 1:
 						$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 )
 			$post_content = $post_content . '<!--more-->' . $post_more;
 		if ( !empty( $dateCreated ) ) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
 			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
 		} else {
-			$post_date = current_time('mysql');
+			$post_date = '';
-			$post_date_gmt = current_time('mysql', 1);
+			$post_date_gmt = '';
 		}
 		$post_category = array();
 		if ( isset( $content_struct['categories'] ) ) {
 			$catnames = $content_struct['categories'];
 		$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 )
+			$data = $postdata;
-				stick_post( $post_ID );
+			$data['sticky'] = $content_struct['sticky'];
-			elseif ( $content_struct['sticky'] == false )
+			$error = $this->_toggle_sticky( $data );
-				unstick_post( $post_ID );
+			if ( $error ) {
+				return $error;
+			}
 		}
 		if ( isset($content_struct['custom_fields']) )
 			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 		$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.'));
+			return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC MovableType API.
 		 *
 		 * @since 3.4.0
 		return strval($post_ID);
 	}
 	/**
-	 * @param integer $post_ID
+	 * Adds an enclosure to a post if it's new.
-	 * @param array   $enclosure
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param integer $post_ID   Post ID.
+	 * @param array   $enclosure Enclosure data.
 	 */
 	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'] . "\n";
 			$found = false;
 	/**
 	 * Attach upload to a post.
 	 *
 	 * @since 2.1.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param int $post_ID Post ID.
 	 * @param string $post_content Post Content for attachment.
 	 */
 	public function attach_uploads( $post_ID, $post_content ) {
 		global $wpdb;
 	/**
 	 * Edit a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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.
 	 */
-	public function mw_editPost($args) {
+	public function mw_editPost( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
 		$post_ID        = (int) $args[0];
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
 		$postdata = get_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
+		 * If there is no post data for the give post id, stop now and return an error.
-		// created (which was the old behavior).
+		 * 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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed 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' ) );
+			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'] ) ) {
 			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
 			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-				return new IXR_Error( 404, __( 'Invalid post format' ) );
+				return new IXR_Error( 404, __( 'Invalid post format.' ) );
 			}
 		}
 		$this->escape($postdata);
 			// 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.' ) );
+							return new IXR_Error( 401, __( 'Sorry, 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.' ) );
+							return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the page author as this user.' ) );
 						}
 						break;
 					default:
-						return new IXR_Error( 401, __( 'Invalid post type' ) );
+						return new IXR_Error( 401, __( 'Invalid post type.' ) );
-						break;
 				}
 				$post_author = $content_struct['wp_author_id'];
 			}
 		}
 						break;
 					case 'open':
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			} else {
 				switch ( (int) $content_struct['mt_allow_comments'] ) {
 					case 0:
 						break;
 					case 1:
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			}
 		}
 						break;
 					case 'open':
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			} else {
 				switch ( (int) $content_struct["mt_allow_pings"] ) {
 					case 0:
 						break;
 					case 1:
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			}
 		}
 			}
 		}
 		$tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
-		if ( ('publish' == $post_status) ) {
+		if ( 'publish' == $post_status || 'private' == $post_status ) {
-			if ( ( 'page' == $post_type ) && ! current_user_can( 'publish_pages' ) ) {
+			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.' ) );
+				return new IXR_Error( 401, __( 'Sorry, you are not allowed 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.' ) );
+				return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
 			}
 		}
 		if ( $post_more )
 			$post_content = $post_content . "<!--more-->" . $post_more;
 			$to_ping = $content_struct['mt_tb_ping_urls'];
 			if ( is_array($to_ping) )
 				$to_ping = implode(' ', $to_ping);
 		}
-		// Do some timestamp voodoo
+		// Do some timestamp voodoo.
 		if ( !empty( $content_struct['date_created_gmt'] ) )
-			// 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();
+		// Default to not flagging the post date to be edited unless it's intentional.
+		$edit_date = false;
 		if ( !empty( $dateCreated ) ) {
 			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
 			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+			// Flag the post date to be edited.
+			$edit_date = true;
 		} else {
 			$post_date     = $postdata['post_date'];
 			$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');
+		$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', '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);
 		if ( is_wp_error( $result ) )
 			return new IXR_Error(500, $result->get_error_message());
 		if ( !$result )
-			return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+			return new IXR_Error(500, __('Sorry, your entry could not be edited.'));
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-			if ( $content_struct['sticky'] == true )
+			$data = $newpost;
-				stick_post( $post_ID );
+			$data['sticky'] = $content_struct['sticky'];
-			elseif ( $content_struct['sticky'] == false )
+			$data['post_type'] = 'post';
-				unstick_post( $post_ID );
+			$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']);
 		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
-			// empty value deletes, non-empty value adds/updates
+			// 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
+		// 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
+		// Handle post formats if assigned, validation is handled earlier in this function.
-		// earlier in this function
 		if ( isset( $content_struct['wp_post_format'] ) )
 			set_post_format( $post_ID, $content_struct['wp_post_format'] );
 		/**
 		 * Fires after a post has been successfully updated via the XML-RPC MovableType API.
 	/**
 	 * Retrieve post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function mw_getPost($args) {
+	public function mw_getPost( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$post_ID  = (int) $args[0];
-		$post_ID     = (int) $args[0];
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$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.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
 		if ($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);
-			foreach($catids as $catid)
+			foreach ($catids as $catid)
 				$categories[] = get_cat_name($catid);
 			$tagnames = array();
 			$tags = wp_get_post_tags( $post_ID );
 			if ( !empty( $tags ) ) {
 			} else {
 				$tagnames = '';
 			}
 			$post = get_extended($postdata['post_content']);
-			$link = post_permalink($postdata['ID']);
+			$link = get_permalink($postdata['ID']);
 			// Get the author info.
 			$author = get_userdata($postdata['post_author']);
 			$allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
 	/**
 	 * Retrieve list of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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    $numberposts
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_getRecentPosts($args) {
+	public function mw_getRecentPosts( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( isset( $args[3] ) )
 			$query = array( 'numberposts' => absint( $args[3] ) );
 		else
 			$query = array();
 		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 are not allowed to edit posts.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts' );
 		$posts_list = wp_get_recent_posts( $query );
 			$post_modified = $this->_convert_date( $entry['post_modified'] );
 			$post_modified_gmt = $this->_convert_date_gmt( $entry['post_modified_gmt'], $entry['post_modified'] );
 			$categories = array();
 			$catids = wp_get_post_categories($entry['ID']);
-			foreach( $catids as $catid )
+			foreach ( $catids as $catid )
 				$categories[] = get_cat_name($catid);
 			$tagnames = array();
 			$tags = wp_get_post_tags( $entry['ID'] );
 			if ( !empty( $tags ) ) {
 			} else {
 				$tagnames = '';
 			}
 			$post = get_extended($entry['post_content']);
-			$link = post_permalink($entry['ID']);
+			$link = get_permalink($entry['ID']);
 			// Get the post author info.
 			$author = get_userdata($entry['post_author']);
 			$allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
 	/**
 	 * Retrieve the list of categories on a given blog.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function mw_getCategories($args) {
+	public function mw_getCategories( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_posts' ) )
 	 *
 	 * @link http://mycvs.org/archives/2004/06/30/file-upload-to-wordpress-in-ecto/
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @global wpdb $wpdb WordPress database abstraction 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 array  $data
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mw_newMediaObject($args) {
+	public function mw_newMediaObject( $args ) {
 		global $wpdb;
-		$username  = $this->escape($args[1]);
+		$username = $this->escape( $args[1] );
-		$password   = $this->escape($args[2]);
+		$password = $this->escape( $args[2] );
-		$data        = $args[3];
+		$data     = $args[3];
 		$name = sanitize_file_name( $data['name'] );
 		$type = $data['type'];
 		$bits = $data['bits'];
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
 		if ( !current_user_can('upload_files') ) {
-			$this->error = new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
+			$this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
+			return $this->error;
+		}
+		if ( is_multisite() && upload_is_user_over_quota( false ) ) {
+			$this->error = new IXR_Error( 401, __( 'Sorry, you have used your space allocation.' ) );
 			return $this->error;
 		}
 		/**
-		 * Filter whether to preempt the XML-RPC media upload.
+		 * Filters whether to preempt the XML-RPC media upload.
 		 *
 		 * Passing a truthy value will effectively short-circuit the media upload,
 		 * returning that value as a 500 error instead.
 		 *
 		 * @since 2.1.0
 		 */
 		if ( $upload_err = apply_filters( 'pre_upload_error', false ) ) {
 			return new IXR_Error( 500, $upload_err );
 		}
-		if ( !empty($data['overwrite']) && ($data['overwrite'] == true) ) {
-			// Get postmeta info on the object.
-			$old_file = $wpdb->get_row("
-				SELECT ID
-				FROM {$wpdb->posts}
-				WHERE post_title = '{$name}'
-					AND post_type = 'attachment'
-			");
-			// Delete previous file.
-			wp_delete_attachment($old_file->ID);
-			// Make sure the new name is different by pre-pending the
-			// previous post id.
-			$filename = preg_replace('/^wpid\d+-/', '', $name);
-			$name = "wpid{$old_file->ID}-{$filename}";
-		}
 		$upload = wp_upload_bits($name, null, $bits);
 		if ( ! empty($upload['error']) ) {
-			$errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
+			/* translators: 1: file name, 2: error message */
-			return new IXR_Error(500, $errorString);
+			$errorString = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );
+			return new IXR_Error( 500, $errorString );
 		}
 		// Construct the attachment array
 		$post_id = 0;
 		if ( ! empty( $data['post_id'] ) ) {
 			$post_id = (int) $data['post_id'];
 			if ( ! current_user_can( 'edit_post', $post_id ) )
-				return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
+				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 		$attachment = array(
 			'post_title' => $name,
 			'post_content' => '',
 			'post_type' => 'attachment',
 		 * @param int   $id   ID of the new attachment.
 		 * @param array $args An array of arguments to add the attachment.
 		 */
 		do_action( 'xmlrpc_call_success_mw_newMediaObject', $id, $args );
-		$struct = array(
+		$struct = $this->_prepare_media_item( get_post( $id ) );
-			'id'   => strval( $id ),
-			'file' => $name,
+		// Deprecated values
-			'url'  => $upload[ 'url' ],
+		$struct['id']   = $struct['attachment_id'];
-			'type' => $type
+		$struct['file'] = $struct['title'];
-		);
+		$struct['url']  = $struct['link'];
-		/** This filter is documented in wp-admin/includes/file.php */
+		return $struct;
-		return apply_filters( 'wp_handle_upload', $struct, 'upload' );
 	}
 	/* MovableType API functions
 	 * specs on http://www.movabletype.org/docs/mtmanual_programmatic.html
 	 */
 	/**
 	 * Retrieve the post titles of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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    $numberposts
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mt_getRecentPostTitles($args) {
+	public function mt_getRecentPostTitles( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( isset( $args[3] ) )
 			$query = array( 'numberposts' => absint( $args[3] ) );
 		else
 			$query = array();
 	/**
 	 * Retrieve list of all categories on blog.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @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
 	 */
-	public function mt_getCategoryList($args) {
+	public function mt_getCategoryList( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( !current_user_can( 'edit_posts' ) )
 	/**
 	 * Retrieve post categories.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
 	 * @return array|IXR_Error
 	 */
-	public function mt_getPostCategories($args) {
+	public function mt_getPostCategories( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$post_ID  = (int) $args[0];
-		$post_ID     = (int) $args[0];
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		if ( ! 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 can not edit this post.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getPostCategories' );
 		$categories = array();
 	/**
 	 * Sets categories for a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
-	 * @return bool|IXR_Error True on success.
+	 *     Method arguments. Note: arguments must be ordered as documented.
-	 */
+	 *
-	public function mt_setPostCategories($args) {
+	 *     @type int    $post_ID
+	 *     @type string $username
-		$this->escape($args);
+	 *     @type string $password
+	 *     @type array  $categories
-		$post_ID     = (int) $args[0];
+	 * }
-		$username  = $args[1];
+	 * @return true|IXR_Error True on success.
+	 */
+	public function mt_setPostCategories( $args ) {
+		$this->escape( $args );
+		$post_ID    = (int) $args[0];
+		$username   = $args[1];
 		$password   = $args[2];
-		$categories  = $args[3];
+		$categories = $args[3];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		if ( ! 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 cannot edit this post.'));
+			return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
 		$catids = array();
 		foreach ( $categories as $cat ) {
 			$catids[] = $cat['categoryId'];
 		}
 	/**
 	 * Retrieve an array of methods supported by this server.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
 	 * @return array
 	 */
-	public function mt_supportedMethods($args) {
+	public function mt_supportedMethods() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.supportedMethods' );
-		$supported_methods = array();
+		return array_keys( $this->methods );
-		foreach ( $this->methods as $key => $value ) {
-			$supported_methods[] = $key;
-		}
-		return $supported_methods;
 	}
 	/**
 	 * Retrieve an empty array because we don't support per-post text filters.
 	 *
 	 * @since 1.5.0
-	 *
+	 */
-	 * @param array $args Method parameters.
+	public function mt_supportedTextFilters() {
-	 */
-	public function mt_supportedTextFilters($args) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.supportedTextFilters' );
 		/**
-		 * Filter the MoveableType text filters list for XML-RPC.
+		 * Filters the MoveableType text filters list for XML-RPC.
 		 *
 		 * @since 2.2.0
 		 *
 		 * @param array $filters An array of text filters.
 		 */
 	/**
 	 * Retrieve trackbacks sent to a given post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param int $post_ID
 	 * @return array|IXR_Error
 	 */
-	public function mt_getTrackbackPings($args) {
+	public function mt_getTrackbackPings( $post_ID ) {
 		global $wpdb;
-		$post_ID = intval($args);
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
 		$actual_post = get_post($post_ID, ARRAY_A);
 	/**
 	 * Sets a post's publish status to 'publish'.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
 	 * @return int|IXR_Error
 	 */
-	public function mt_publishPost($args) {
+	public function mt_publishPost( $args ) {
+		$this->escape( $args );
-		$this->escape($args);
+		$post_ID  = (int) $args[0];
-		$post_ID     = (int) $args[0];
+		$username = $args[1];
-		$username  = $args[1];
+		$password = $args[2];
-		$password   = $args[2];
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		$postdata = get_post($post_ID, ARRAY_A);
 		if ( ! $postdata )
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you cannot publish this post.'));
+			return new IXR_Error(401, __('Sorry, you are not allowed to publish this post.'));
 		$postdata['post_status'] = 'publish';
 		// retain old cats
 		$cats = wp_get_post_categories($post_ID);
 		$postdata['post_category'] = $cats;
 		$this->escape($postdata);
-		$result = wp_update_post($postdata);
+		return wp_update_post( $postdata );
-		return $result;
 	}
 	/* PingBack functions
 	 * specs on www.hixie.ch/specs/pingback/pingback
 	 */
 	/**
 	 * Retrieves a pingback and registers it.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type string $pagelinkedfrom
+	 *     @type string $pagelinkedto
+	 * }
 	 * @return string|IXR_Error
 	 */
-	public function pingback_ping($args) {
+	public function pingback_ping( $args ) {
 		global $wpdb;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'pingback.ping' );
-		$this->escape($args);
+		$this->escape( $args );
-		$pagelinkedfrom = $args[0];
+		$pagelinkedfrom = str_replace( '&amp;', '&', $args[0] );
-		$pagelinkedto   = $args[1];
+		$pagelinkedto = str_replace( '&amp;', '&', $args[1] );
+		$pagelinkedto = str_replace( '&', '&amp;', $pagelinkedto );
-		$pagelinkedfrom = str_replace('&amp;', '&', $pagelinkedfrom);
-		$pagelinkedto = str_replace('&amp;', '&', $pagelinkedto);
-		$pagelinkedto = str_replace('&', '&amp;', $pagelinkedto);
 		/**
-		 * Filter the pingback source URI.
+		 * Filters the pingback source URI.
 		 *
 		 * @since 3.6.0
 		 *
 		 * @param string $pagelinkedfrom URI of the page linked from.
 		 * @param string $pagelinkedto   URI of the page linked to.
 		sleep(1);
 		$remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
 		/** This filter is documented in wp-includes/class-http.php */
-		$user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . $GLOBALS['wp_version'] . '; ' . get_bloginfo( 'url' ) );
+		$user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) );
 		// Let's check the remote site
 		$http_api_args = array(
 			'timeout' => 10,
 			'redirection' => 0,
 			'user-agent' => "$user_agent; verifying pingback from $remote_ip",
 			'headers' => array(
 				'X-Pingback-Forwarded-For' => $remote_ip,
 			),
 		);
 		$request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
-		$linea = wp_remote_retrieve_body( $request );
+		$remote_source = $remote_source_original = wp_remote_retrieve_body( $request );
-		if ( !$linea )
+		if ( ! $remote_source ) {
 			return $this->pingback_error( 16, __( 'The source URL does not exist.' ) );
+		}
 		/**
-		 * Filter the pingback remote source.
+		 * Filters the pingback remote source.
 		 *
 		 * @since 2.5.0
 		 *
-		 * @param string $linea        Response object for the page linked from.
+		 * @param string $remote_source Response source for the page linked from.
-		 * @param string $pagelinkedto URL of the page linked to.
+		 * @param string $pagelinkedto  URL of the page linked to.
 		 */
-		$linea = apply_filters( 'pre_remote_source', $linea, $pagelinkedto );
+		$remote_source = apply_filters( 'pre_remote_source', $remote_source, $pagelinkedto );
 		// Work around bug in strip_tags():
-		$linea = str_replace('<!DOC', '<DOC', $linea);
+		$remote_source = str_replace( '<!DOC', '<DOC', $remote_source );
-		$linea = preg_replace( '/[\r\n\t ]+/', ' ', $linea ); // normalize spaces
+		$remote_source = preg_replace( '/[\r\n\t ]+/', ' ', $remote_source ); // normalize spaces
-		$linea = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $linea );
+		$remote_source = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $remote_source );
-		preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
+		preg_match( '|<title>([^<]*?)</title>|is', $remote_source, $matchtitle );
-		$title = $matchtitle[1];
+		$title = isset( $matchtitle[1] ) ? $matchtitle[1] : '';
-		if ( empty( $title ) )
+		if ( empty( $title ) ) {
-			return $this->pingback_error( 32, __('We cannot find a title on that page.' ) );
+			return $this->pingback_error( 32, __( 'We cannot find a title on that page.' ) );
+		}
-		$linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
+		$remote_source = strip_tags( $remote_source, '<a>' ); // just keep the tag we need
-		$p = explode( "\n\n", $linea );
+		$p = explode( "\n\n", $remote_source );
 		$preg_target = preg_quote($pagelinkedto, '|');
 		foreach ( $p as $para ) {
 			if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
 		$comment_author_url = $pagelinkedfrom;
 		$comment_content = $context;
 		$this->escape($comment_content);
 		$comment_type = 'pingback';
-		$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_content', 'comment_type');
+		$commentdata = compact(
+			'comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email',
+			'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
+		);
 		$comment_ID = wp_new_comment($commentdata);
+		if ( is_wp_error( $comment_ID ) ) {
+			return $this->pingback_error( 0, $comment_ID->get_error_message() );
+		}
 		/**
 		 * Fires after a post pingback has been sent.
 		 *
 		 * @since 0.71
 		 *
 		 * @param int $comment_ID Comment ID.
 		 */
 		do_action( 'pingback_post', $comment_ID );
-		return sprintf(__('Pingback from %1$s to %2$s registered. Keep the web talking! :-)'), $pagelinkedfrom, $pagelinkedto);
+		/* translators: 1: URL of the page linked from, 2: URL of the page linked to */
+		return sprintf( __( 'Pingback from %1$s to %2$s registered. Keep the web talking! :-)' ), $pagelinkedfrom, $pagelinkedto );
 	}
 	/**
 	 * Retrieve array of URLs that pingbacked the given URL.
 	 *
 	 * Specs on http://www.aquarionics.com/misc/archives/blogite/0198.html
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $url
 	 * @return array|IXR_Error
 	 */
-	public function pingback_extensions_getPingbacks($args) {
+	public function pingback_extensions_getPingbacks( $url ) {
 		global $wpdb;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
-		$this->escape($args);
+		$url = $this->escape( $url );
-		$url = $args;
 		$post_ID = url_to_postid($url);
 		if ( !$post_ID ) {
 			// We aren't sure that the resource is available and/or pingback enabled
 	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
 		return $pingbacks;
 	}
 	/**
-	 * @param integer $code
+	 * Sends a pingback error based on the given error code and message.
-	 * @param string $message
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param int    $code    Error code.
+	 * @param string $message Error message.
+	 * @return IXR_Error Error object.
 	 */
 	protected function pingback_error( $code, $message ) {
 		/**
-		 * Filter the XML-RPC pingback error return.
+		 * Filters the XML-RPC pingback error return.
 		 *
 		 * @since 3.5.1
 		 *
 		 * @param IXR_Error $error An IXR_Error object containing the error code and message.
 		 */

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9