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

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 * 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 {@see 'xmlrpc_enabled'} filter found in wp_xmlrpc_server::login().
+* via the {@see 'xmlrpc_enabled'} filter found in wp_xmlrpc_server::set_is_enabled().
 *
 * @since 1.5.0
 *
 * @see IXR_Server
 */
 	 * Flags that the user authentication has failed in this instance of wp_xmlrpc_server.
 	 *
 	 * @var bool
 	 */
 	protected $auth_failed = false;
+	/**
+	 * Flags that XML-RPC is enabled
+	 *
+	 * @var bool
+	 */
+	private $is_enabled;
 	/**
 	 * Registers all of the XMLRPC methods that XMLRPC server understands.
 	 *
 	 * Sets up server and method property. Passes XMLRPC
 		 * @since 1.5.0
 		 *
 		 * @param string[] $methods An array of XML-RPC methods, keyed by their methodName.
 		 */
 		$this->methods = apply_filters( 'xmlrpc_methods', $this->methods );
-	}
+		$this->set_is_enabled();
-	/**
+	}
-	 * Make private/protected methods readable for backward compatibility.
-	 *
+	/**
-	 * @since 4.0.0
+	 * Set wp_xmlrpc_server::$is_enabled property.
 	 *
-	 * @param string $name      Method to call.
+	 * Determine whether the xmlrpc server is enabled on this WordPress install
-	 * @param array  $arguments Arguments to pass when calling.
+	 * and set the is_enabled property accordingly.
-	 * @return array|IXR_Error|false Return value of the callback, false otherwise.
+	 *
-	 */
+	 * @since 5.7.3
-	public function __call( $name, $arguments ) {
+	 */
-		if ( '_multisite_getUsersBlogs' === $name ) {
+	private function set_is_enabled() {
-			return $this->_multisite_getUsersBlogs( ...$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
-	 *
-	 * @return string Hello string response.
-	 */
-	public function sayHello() {
-		return 'Hello!';
-	}
-	/**
-	 * Test XMLRPC API by adding two numbers for client.
-	 *
-	 * @since 1.5.0
-	 *
-	 * @param array $args {
-	 *     Method arguments. Note: arguments must be ordered as documented.
-	 *
-	 *     @type int $number1 A number to add.
-	 *     @type int $number2 A second number to add.
-	 * }
-	 * @return int Sum of the two given numbers.
-	 */
-	public function addTwoNumbers( $args ) {
-		$number1 = $args[0];
-		$number2 = $args[1];
-		return $number1 + $number2;
-	}
-	/**
-	 * Log user in.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param string $username User's username.
-	 * @param string $password User's password.
-	 * @return WP_User|bool WP_User object if authentication passed, false otherwise
-	 */
-	public function login( $username, $password ) {
 		/*
 		 * Respect old get_option() filters left for back-compat when the 'enable_xmlrpc'
 		 * option was deprecated in 3.5.0. Use the 'xmlrpc_enabled' hook instead.
 		 */
-		$enabled = apply_filters( 'pre_option_enable_xmlrpc', false );
+		$is_enabled = apply_filters( 'pre_option_enable_xmlrpc', false );
-		if ( false === $enabled ) {
+		if ( false === $is_enabled ) {
-			$enabled = apply_filters( 'option_enable_xmlrpc', true );
+			$is_enabled = apply_filters( 'option_enable_xmlrpc', true );
 		}
 		/**
 		 * Filters whether XML-RPC methods requiring authentication are enabled.
 		 *
 		 * 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.
+		 * @param bool $is_enabled Whether XML-RPC is enabled. Default true.
 		 */
-		$enabled = apply_filters( 'xmlrpc_enabled', $enabled );
+		$this->is_enabled = apply_filters( 'xmlrpc_enabled', $is_enabled );
+	}
-		if ( ! $enabled ) {
+	/**
+	 * Make private/protected methods readable for backward compatibility.
+	 *
+	 * @since 4.0.0
+	 *
+	 * @param string $name      Method to call.
+	 * @param array  $arguments Arguments to pass when calling.
+	 * @return array|IXR_Error|false Return value of the callback, false otherwise.
+	 */
+	public function __call( $name, $arguments ) {
+		if ( '_multisite_getUsersBlogs' === $name ) {
+			return $this->_multisite_getUsersBlogs( ...$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
+	 *
+	 * @return string Hello string response.
+	 */
+	public function sayHello() {
+		return 'Hello!';
+	}
+	/**
+	 * Test XMLRPC API by adding two numbers for client.
+	 *
+	 * @since 1.5.0
+	 *
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int $number1 A number to add.
+	 *     @type int $number2 A second number to add.
+	 * }
+	 * @return int Sum of the two given numbers.
+	 */
+	public function addTwoNumbers( $args ) {
+		$number1 = $args[0];
+		$number2 = $args[1];
+		return $number1 + $number2;
+	}
+	/**
+	 * Log user in.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param string $username User's username.
+	 * @param string $password User's password.
+	 * @return WP_User|false WP_User object if authentication passed, false otherwise
+	 */
+	public function login( $username, $password ) {
+		if ( ! $this->is_enabled ) {
 			$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
 			return false;
 		}
 		if ( $this->auth_failed ) {
 			/**
 			 * Filters the XML-RPC user login error message.
 			 *
 			 * @since 3.5.0
 			 *
-			 * @param string   $error The XML-RPC error message.
+			 * @param IXR_Error $error The XML-RPC error message.
-			 * @param WP_Error $user  WP_Error object.
+			 * @param WP_Error  $user  WP_Error object.
 			 */
 			$this->error = apply_filters( 'xmlrpc_login_error', $this->error, $user );
 			return false;
 		}
 				$this->escape( $v );
 			} elseif ( ! is_object( $v ) ) {
 				$v = wp_slash( $v );
 			}
 		}
+	}
+	/**
+	 * Send error response to client.
+	 *
+	 * Send an XML error response to the client. If the endpoint is enabled
+	 * an HTTP 200 response is always sent per the XML-RPC specification.
+	 *
+	 * @since 5.7.3
+	 *
+	 * @param IXR_Error|string $error   Error code or an error object.
+	 * @param false            $message Error message. Optional.
+	 */
+	public function error( $error, $message = false ) {
+		// Accepts either an error object or an error code and message
+		if ( $message && ! is_object( $error ) ) {
+			$error = new IXR_Error( $error, $message );
+		}
+		if ( ! $this->is_enabled ) {
+			status_header( $error->code );
+		}
+		$this->output( $error->getXml() );
 	}
 	/**
 	 * Retrieve custom fields for post.
 	 *
 		 *
 		 * 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
+		 * @since 5.7.0 Added the `$args` and `$server` parameters.
 		 *
-		 * @param string $name The method name.
+		 * @param string           $name   The method name.
+		 * @param array|string     $args   The escaped arguments passed to the method.
+		 * @param wp_xmlrpc_server $server The XML-RPC server instance.
 		 */
-		do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
+		do_action( 'xmlrpc_call', 'wp.getUsersBlogs', $args, $this );
 		$blogs           = (array) get_blogs_of_user( $user->ID );
 		$struct          = array();
 		$primary_blog_id = 0;
 		$active_blog     = get_active_blog_for_user( $user->ID );
 	}
 	/**
 	 * Prepares taxonomy data for return in an XML-RPC object.
 	 *
-	 * @param object $taxonomy The unprepared taxonomy data.
+	 * @param WP_Taxonomy $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.
 	 */
 	protected function _prepare_taxonomy( $taxonomy, $fields ) {
 		$_taxonomy = array(
 			'name'         => $taxonomy->name,
 		if ( in_array( 'cap', $fields, true ) ) {
 			$_taxonomy['cap'] = (array) $taxonomy->cap;
 		}
 		if ( in_array( 'menu', $fields, true ) ) {
-			$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+			$_taxonomy['show_in_menu'] = (bool) $taxonomy->show_in_menu;
 		}
 		if ( in_array( 'object_type', $fields, true ) ) {
 			$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
 		}
 		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_id']          = (string) $_term['term_id'];
-		$_term['term_group']       = strval( $_term['term_group'] );
+		$_term['term_group']       = (string) $_term['term_group'];
-		$_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
+		$_term['term_taxonomy_id'] = (string) $_term['term_taxonomy_id'];
-		$_term['parent']           = strval( $_term['parent'] );
+		$_term['parent']           = (string) $_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'] );
+		$_term['count'] = (int) $_term['count'];
 		// Get term meta.
 		$_term['custom_fields'] = $this->get_term_custom_fields( $_term['term_id'] );
 		/**
 	 * @param array $fields The subset of post type fields to return.
 	 * @return array The prepared post data.
 	 */
 	protected function _prepare_post( $post, $fields ) {
 		// Holds the data for this post. built up based on $fields.
-		$_post = array( 'post_id' => strval( $post['ID'] ) );
+		$_post = array( 'post_id' => (string) $post['ID'] );
 		// Prepare common post fields.
 		$post_fields = array(
 			'post_title'        => $post['post_title'],
 			'post_date'         => $this->_convert_date( $post['post_date'] ),
 			'post_name'         => $post['post_name'],
 			'post_author'       => $post['post_author'],
 			'post_password'     => $post['post_password'],
 			'post_excerpt'      => $post['post_excerpt'],
 			'post_content'      => $post['post_content'],
-			'post_parent'       => strval( $post['post_parent'] ),
+			'post_parent'       => (string) $post['post_parent'],
 			'post_mime_type'    => $post['post_mime_type'],
 			'link'              => get_permalink( $post['ID'] ),
 			'guid'              => $post['guid'],
-			'menu_order'        => intval( $post['menu_order'] ),
+			'menu_order'        => (int) $post['menu_order'],
 			'comment_status'    => $post['comment_status'],
 			'ping_status'       => $post['ping_status'],
 			'sticky'            => ( 'post' === $post['post_type'] && is_sticky( $post['ID'] ) ),
 		);
 	}
 	/**
 	 * Prepares media item data for return in an XML-RPC object.
 	 *
-	 * @param object $media_item     The unprepared media item data.
+	 * @param WP_Post $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.
 	 */
 	protected function _prepare_media_item( $media_item, $thumbnail_size = 'thumbnail' ) {
 		$_media_item = array(
-			'attachment_id'    => strval( $media_item->ID ),
+			'attachment_id'    => (string) $media_item->ID,
 			'date_created_gmt' => $this->_convert_date_gmt( $media_item->post_date_gmt, $media_item->post_date ),
 			'parent'           => $media_item->post_parent,
 			'link'             => wp_get_attachment_url( $media_item->ID ),
 			'title'            => $media_item->post_title,
 			'caption'          => $media_item->post_excerpt,
 		/**
 		 * 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 array   $_media_item    An array of media item data.
-		 * @param object $media_item     Media item object.
+		 * @param WP_Post $media_item     Media item object.
-		 * @param string $thumbnail_size Image size.
+		 * @param string  $thumbnail_size Image size.
 		 */
 		return apply_filters( 'xmlrpc_prepare_media_item', $_media_item, $media_item, $thumbnail_size );
 	}
 	/**
 	 * Prepares page data for return in an XML-RPC object.
 	 *
-	 * @param object $page The unprepared page data.
+	 * @param WP_Post $page The unprepared page data.
 	 * @return array The prepared page data.
 	 */
 	protected function _prepare_page( $page ) {
 		// Get all of the page content and link.
 		$full_page = get_extended( $page->post_content );
 	}
 	/**
 	 * Prepares comment data for return in an XML-RPC object.
 	 *
-	 * @param object $comment The unprepared comment data.
+	 * @param WP_Comment $comment The unprepared comment data.
 	 * @return array The prepared comment data.
 	 */
 	protected function _prepare_comment( $comment ) {
 		// Format page date.
 		$comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
 	 * @param WP_User $user   The unprepared user object.
 	 * @param array   $fields The subset of user fields to return.
 	 * @return array The prepared user data.
 	 */
 	protected function _prepare_user( $user, $fields ) {
-		$_user = array( 'user_id' => strval( $user->ID ) );
+		$_user = array( 'user_id' => (string) $user->ID );
 		$user_fields = array(
 			'username'     => $user->user_login,
 			'first_name'   => $user->user_firstname,
 			'last_name'    => $user->user_lastname,
 				$content_struct['post_date_gmt'] = $this->_convert_date( $content_struct['post_date_gmt'] );
 			}
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newPost' );
+		do_action( 'xmlrpc_call', 'wp.newPost', $args, $this );
 		unset( $content_struct['ID'] );
 		return $this->_insert_post( $user, $content_struct );
 	}
 	 * Helper method for filtering out elements from an array.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param int $count Number to compare to one.
+	 * @return bool True if the number is greater than one, false otherwise.
 	 */
 	private function _is_greater_than_one( $count ) {
 		return $count > 1;
 	}
 			} else {
 				return new IXR_Error( 401, __( 'Sorry, the post could not be created.' ) );
 			}
 		}
-		return strval( $post_ID );
+		return (string) $post_ID;
 	}
 	/**
 	 * Edit a post for any registered post type.
 	 *
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editPost' );
+		do_action( 'xmlrpc_call', 'wp.editPost', $args, $this );
 		$post = get_post( $post_id, ARRAY_A );
 		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deletePost' );
+		do_action( 'xmlrpc_call', 'wp.deletePost', $args, $this );
 		$post = get_post( $post_id, ARRAY_A );
 		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPost' );
+		do_action( 'xmlrpc_call', 'wp.getPost', $args, $this );
 		$post = get_post( $post_id, ARRAY_A );
 		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPosts' );
+		do_action( 'xmlrpc_call', 'wp.getPosts', $args, $this );
 		$query = array();
 		if ( isset( $filter['post_type'] ) ) {
 			$post_type = get_post_type_object( $filter['post_type'] );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newTerm' );
+		do_action( 'xmlrpc_call', 'wp.newTerm', $args, $this );
 		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 		// 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'] );
+		return (string) $term['term_id'];
 	}
 	/**
 	 * Edit a term.
 	 *
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editTerm' );
+		do_action( 'xmlrpc_call', 'wp.editTerm', $args, $this );
 		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 	 *     @type string $username     Username.
 	 *     @type string $password     Password.
 	 *     @type string $taxnomy_name Taxonomy name.
 	 *     @type int    $term_id      Term ID.
 	 * }
-	 * @return bool|IXR_Error True on success, IXR_Error instance on failure.
+	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_deleteTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 5 ) ) {
 			return $this->error;
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deleteTerm' );
+		do_action( 'xmlrpc_call', 'wp.deleteTerm', $args, $this );
 		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTerm' );
+		do_action( 'xmlrpc_call', 'wp.getTerm', $args, $this );
 		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTerms' );
+		do_action( 'xmlrpc_call', 'wp.getTerms', $args, $this );
 		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
+		do_action( 'xmlrpc_call', 'wp.getTaxonomy', $args, $this );
 		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getTaxonomies' );
+		do_action( 'xmlrpc_call', 'wp.getTaxonomies', $args, $this );
 		$taxonomies = get_taxonomies( $filter, 'objects' );
 		// Holds all the taxonomy data.
 		$struct = array();
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getUser' );
+		do_action( 'xmlrpc_call', 'wp.getUser', $args, $this );
 		if ( ! current_user_can( 'edit_user', $user_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this user.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getUsers' );
+		do_action( 'xmlrpc_call', 'wp.getUsers', $args, $this );
 		if ( ! current_user_can( 'list_users' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to list users.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getProfile' );
+		do_action( 'xmlrpc_call', 'wp.getProfile', $args, $this );
 		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editProfile' );
+		do_action( 'xmlrpc_call', 'wp.editProfile', $args, $this );
 		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
 		}
 		if ( ! current_user_can( 'edit_page', $page_id ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'wp.getPage', $args, $this );
 		// If we found the page then format the data.
 		if ( $page->ID && ( 'page' === $page->post_type ) ) {
 			return $this->_prepare_page( $page );
 		} else {
 		if ( ! current_user_can( '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' );
+		do_action( 'xmlrpc_call', 'wp.getPages', $args, $this );
 		$pages     = get_posts(
 			array(
 				'post_type'   => 'page',
 				'post_status' => 'any',
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newPage' );
+		do_action( 'xmlrpc_call', 'wp.newPage', $args, $this );
 		// Mark this as content for a page.
 		$args[3]['post_type'] = 'page';
 		// Let mw_newPost() do all of the heavy lifting.
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deletePage' );
+		do_action( 'xmlrpc_call', 'wp.deletePage', $args, $this );
 		// Get the current page based on the 'page_id' and
 		// make sure it is a page and not a post.
 		$actual_page = get_post( $page_id, ARRAY_A );
 		if ( ! $actual_page || ( 'page' !== $actual_page['post_type'] ) ) {
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.editPage' );
+		do_action( 'xmlrpc_call', 'wp.editPage', $args, $this );
 		// Get the page data and make sure it is a page.
 		$actual_page = get_post( $page_id, ARRAY_A );
 		if ( ! $actual_page || ( 'page' !== $actual_page['post_type'] ) ) {
 			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
 		if ( ! current_user_can( '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' );
+		do_action( 'xmlrpc_call', 'wp.getPageList', $args, $this );
 		// Get list of page IDs and titles.
 		$page_list = $wpdb->get_results(
 			"
 			SELECT ID page_id,
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'wp.getAuthors', $args, $this );
 		$authors = array();
 		foreach ( get_users( array( 'fields' => array( 'ID', 'user_login', 'display_name' ) ) ) as $user ) {
 			$authors[] = array(
 				'user_id'      => $user->ID,
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getKeywords' );
+		do_action( 'xmlrpc_call', 'wp.getKeywords', $args, $this );
 		$tags = array();
 		$all_tags = get_tags();
 		if ( $all_tags ) {
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newCategory' );
+		do_action( 'xmlrpc_call', 'wp.newCategory', $args, $this );
 		// Make sure the user is allowed to add a category.
 		if ( ! current_user_can( 'manage_categories' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a category.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.deleteCategory' );
+		do_action( 'xmlrpc_call', 'wp.deleteCategory', $args, $this );
 		if ( ! current_user_can( 'delete_term', $category_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this category.' ) );
 		}
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.suggestCategories' );
+		do_action( 'xmlrpc_call', 'wp.suggestCategories', $args, $this );
 		$category_suggestions = array();
 		$args                 = array(
 			'get'        => 'all',
 			'number'     => $max_results,
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getComment' );
+		do_action( 'xmlrpc_call', 'wp.getComment', $args, $this );
 		$comment = get_comment( $comment_id );
 		if ( ! $comment ) {
 			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getComments' );
+		do_action( 'xmlrpc_call', 'wp.getComments', $args, $this );
 		if ( isset( $struct['status'] ) ) {
 			$status = $struct['status'];
 		} else {
 			$status = '';
 		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' );
+		do_action( 'xmlrpc_call', 'wp.deleteComment', $args, $this );
 		$status = wp_delete_comment( $comment_ID );
 		if ( $status ) {
 			/**
 		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' );
+		do_action( 'xmlrpc_call', 'wp.editComment', $args, $this );
 		$comment = array(
 			'comment_ID' => $comment_ID,
 		);
 		if ( isset( $content_struct['status'] ) ) {
 		if ( ! comments_open( $post_id ) ) {
 			return new IXR_Error( 403, __( 'Sorry, comments are closed for this item.' ) );
 		}
-		if ( empty( $content_struct['content'] ) ) {
+		if (
-			return new IXR_Error( 403, __( 'Comment is required.' ) );
+			'publish' === get_post_status( $post_id ) &&
+			! current_user_can( 'edit_post', $post_id ) &&
+			post_password_required( $post_id )
+		) {
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
+		}
+		if (
+			'private' === get_post_status( $post_id ) &&
+			! current_user_can( 'read_post', $post_id )
+		) {
+			return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
 		}
 		$comment = array(
 			'comment_post_ID' => $post_id,
-			'comment_content' => $content_struct['content'],
+			'comment_content' => trim( $content_struct['content'] ),
 		);
 		if ( $logged_in ) {
 			$display_name = $user->display_name;
 			$user_email   = $user->user_email;
 			}
 			$comment['user_ID'] = 0;
 			if ( get_option( 'require_name_email' ) ) {
-				if ( strlen( $comment['comment_author_email'] < 6 ) || '' === $comment['comment_author'] ) {
+				if ( strlen( $comment['comment_author_email'] ) < 6 || '' === $comment['comment_author'] ) {
 					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.' ) );
 				}
 			}
 		}
 		$comment['comment_parent'] = isset( $content_struct['comment_parent'] ) ? absint( $content_struct['comment_parent'] ) : 0;
+		/** This filter is documented in wp-includes/comment.php */
+		$allow_empty = apply_filters( 'allow_empty_comment', false, $comment );
+		if ( ! $allow_empty && '' === $comment['comment_content'] ) {
+			return new IXR_Error( 403, __( 'Comment is required.' ) );
+		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.newComment' );
+		do_action( 'xmlrpc_call', 'wp.newComment', $args, $this );
 		$comment_ID = wp_new_comment( $comment, true );
 		if ( is_wp_error( $comment_ID ) ) {
 			return new IXR_Error( 403, $comment_ID->get_error_message() );
 		}
 		if ( ! current_user_can( 'publish_posts' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getCommentStatusList' );
+		do_action( 'xmlrpc_call', 'wp.getCommentStatusList', $args, $this );
 		return get_comment_statuses();
 	}
 	/**
 		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details of this post.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getCommentCount' );
+		do_action( 'xmlrpc_call', 'wp.getCommentCount', $args, $this );
 		$count = wp_count_comments( $post_id );
 		return array(
 			'approved'            => $count->approved,
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
+		do_action( 'xmlrpc_call', 'wp.getPostStatusList', $args, $this );
 		return get_post_statuses();
 	}
 	/**
 		if ( ! current_user_can( 'edit_pages' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
+		do_action( 'xmlrpc_call', 'wp.getPageStatusList', $args, $this );
 		return get_page_statuses();
 	}
 	/**
 		if ( ! current_user_can( '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' );
+		do_action( 'xmlrpc_call', 'wp.getMediaItem', $args, $this );
 		$attachment = get_post( $attachment_id );
-		if ( ! $attachment ) {
+		if ( ! $attachment || 'attachment' !== $attachment->post_type ) {
 			return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
 		}
 		return $this->_prepare_media_item( $attachment );
 	}
 		if ( ! current_user_can( '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' );
+		do_action( 'xmlrpc_call', 'wp.getMediaLibrary', $args, $this );
 		$parent_id = ( isset( $struct['parent_id'] ) ) ? absint( $struct['parent_id'] ) : '';
 		$mime_type = ( isset( $struct['mime_type'] ) ) ? $struct['mime_type'] : '';
 		$offset    = ( isset( $struct['offset'] ) ) ? absint( $struct['offset'] ) : 0;
 		$number    = ( isset( $struct['number'] ) ) ? absint( $struct['number'] ) : -1;
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostFormats' );
+		do_action( 'xmlrpc_call', 'wp.getPostFormats', $args, $this );
 		$formats = get_post_format_strings();
 		// Find out if they want a list of currently supports formats.
 		if ( isset( $args[3] ) && is_array( $args[3] ) ) {
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostType' );
+		do_action( 'xmlrpc_call', 'wp.getPostType', $args, $this );
 		if ( ! post_type_exists( $post_type_name ) ) {
 			return new IXR_Error( 403, __( 'Invalid post type.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getPostTypes' );
+		do_action( 'xmlrpc_call', 'wp.getPostTypes', $args, $this );
 		$post_types = get_post_types( $filter, 'objects' );
 		$struct = array();
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.getRevisions' );
+		do_action( 'xmlrpc_call', 'wp.getRevisions', $args, $this );
 		$post = get_post( $post_id );
 		if ( ! $post ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'wp.restoreRevision' );
+		do_action( 'xmlrpc_call', 'wp.restoreRevision', $args, $this );
 		$revision = wp_get_post_revision( $revision_id );
 		if ( ! $revision ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
+		do_action( 'xmlrpc_call', 'blogger.getUsersBlogs', $args, $this );
 		$is_admin = current_user_can( 'manage_options' );
 		$struct = array(
 			'isAdmin'  => $is_admin,
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'blogger.getUserInfo', $args, $this );
 		$struct = array(
 			'nickname'  => $user->nickname,
 			'userid'    => $user->ID,
 			'url'       => $user->user_url,
 		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'blogger.getPost', $args, $this );
 		$categories = implode( ',', wp_get_post_categories( $post_ID ) );
 		$content  = '<title>' . wp_unslash( $post_data['post_title'] ) . '</title>';
 		$content .= '<category>' . $categories . '</category>';
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'blogger.getRecentPosts', $args, $this );
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list ) {
 			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.newPost' );
+		do_action( 'xmlrpc_call', 'blogger.newPost', $args, $this );
 		$cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
 		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || ! current_user_can( $cap ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.editPost' );
+		do_action( 'xmlrpc_call', 'blogger.editPost', $args, $this );
 		$actual_post = get_post( $post_ID, ARRAY_A );
 		if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'blogger.deletePost' );
+		do_action( 'xmlrpc_call', 'blogger.deletePost', $args, $this );
 		$actual_post = get_post( $post_ID, ARRAY_A );
 		if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
+		do_action( 'xmlrpc_call', 'metaWeblog.newPost', $args, $this );
 		$page_template = '';
 		if ( ! empty( $content_struct['post_type'] ) ) {
 			if ( 'page' === $content_struct['post_type'] ) {
 				if ( $publish ) {
 		 * @param int   $post_ID ID of the new post.
 		 * @param array $args    An array of arguments to create the new post.
 		 */
 		do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
-		return strval( $post_ID );
+		return (string) $post_ID;
 	}
 	/**
 	 * Adds an enclosure to a post if it's new.
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param integer $post_ID   Post ID.
+	 * @param int   $post_ID   Post ID.
-	 * @param array   $enclosure Enclosure data.
+	 * @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;
 	 *     @type string $username
 	 *     @type string $password
 	 *     @type array  $content_struct
 	 *     @type int    $publish
 	 * }
-	 * @return bool|IXR_Error True on success.
+	 * @return true|IXR_Error True on success.
 	 */
 	public function mw_editPost( $args ) {
 		$this->escape( $args );
 		$post_ID        = (int) $args[0];
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
+		do_action( 'xmlrpc_call', 'metaWeblog.editPost', $args, $this );
 		$postdata = get_post( $post_ID, ARRAY_A );
 		/*
 		 * If there is no post data for the give post ID, stop now and return an error.
 		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'metaWeblog.getPost', $args, $this );
 		if ( '' !== $postdata['post_date'] ) {
 			$post_date         = $this->_convert_date( $postdata['post_date'] );
 			$post_date_gmt     = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
 			$post_modified     = $this->_convert_date( $postdata['post_modified'] );
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts', $args, $this );
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list ) {
 			return array();
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.getCategories' );
+		do_action( 'xmlrpc_call', 'metaWeblog.getCategories', $args, $this );
 		$categories_struct = array();
 		$cats = get_categories( array( 'get' => 'all' ) );
 		if ( $cats ) {
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
+		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject', $args, $this );
 		if ( ! current_user_can( 'upload_files' ) ) {
 			$this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
 			return $this->error;
 		}
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles' );
+		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles', $args, $this );
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list ) {
 			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
 		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getCategoryList' );
+		do_action( 'xmlrpc_call', 'mt.getCategoryList', $args, $this );
 		$categories_struct = array();
 		$cats = get_categories(
 			array(
 		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			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' );
+		do_action( 'xmlrpc_call', 'mt.getPostCategories', $args, $this );
 		$categories = array();
-		$catids     = wp_get_post_categories( intval( $post_ID ) );
+		$catids     = wp_get_post_categories( (int) $post_ID );
 		// First listed category will be the primary category.
 		$isPrimary = true;
 		foreach ( $catids as $catid ) {
 			$categories[] = array(
 				'categoryName' => get_cat_name( $catid ),
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.setPostCategories' );
+		do_action( 'xmlrpc_call', 'mt.setPostCategories', $args, $this );
 		if ( ! get_post( $post_ID ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 	 *
 	 * @return array
 	 */
 	public function mt_supportedMethods() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.supportedMethods' );
+		do_action( 'xmlrpc_call', 'mt.supportedMethods', array(), $this );
 		return array_keys( $this->methods );
 	}
 	/**
 	 *
 	 * @since 1.5.0
 	 */
 	public function mt_supportedTextFilters() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.supportedTextFilters' );
+		do_action( 'xmlrpc_call', 'mt.supportedTextFilters', array(), $this );
 		/**
 		 * Filters the MoveableType text filters list for XML-RPC.
 		 *
 		 * @since 2.2.0
 	 */
 	public function mt_getTrackbackPings( $post_ID ) {
 		global $wpdb;
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
+		do_action( 'xmlrpc_call', 'mt.getTrackbackPings', $post_ID, $this );
 		$actual_post = get_post( $post_ID, ARRAY_A );
 		if ( ! $actual_post ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		if ( ! $user ) {
 			return $this->error;
 		}
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.publishPost' );
+		do_action( 'xmlrpc_call', 'mt.publishPost', $args, $this );
 		$postdata = get_post( $post_ID, ARRAY_A );
 		if ( ! $postdata ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 	 */
 	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' );
+		do_action( 'xmlrpc_call', 'pingback.ping', $args, $this );
 		$this->escape( $args );
 		$pagelinkedfrom = str_replace( '&amp;', '&', $args[0] );
 		$pagelinkedto   = str_replace( '&amp;', '&', $args[1] );
 			// The query string defines the post_ID (?p=XXXX).
 			$blah    = explode( '=', $match[0] );
 			$post_ID = (int) $blah[1];
 		} elseif ( isset( $urltest['fragment'] ) ) {
 			// An #anchor is there, it's either...
-			if ( intval( $urltest['fragment'] ) ) {
+			if ( (int) $urltest['fragment'] ) {
 				// ...an integer #XXXX (simplest case),
 				$post_ID = (int) $urltest['fragment'];
 			} elseif ( preg_match( '/post-[0-9]+/', $urltest['fragment'] ) ) {
 				// ...a post ID in the form 'post-###',
 				$post_ID = preg_replace( '/[^0-9]+/', '', $urltest['fragment'] );
 	 */
 	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' );
+		do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks', $url, $this );
 		$url = $this->escape( $url );
 		$post_ID = url_to_postid( $url );
 		if ( ! $post_ID ) {

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4