From dc305e9e0acde0bc862f17982441f1d8be23ab99 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 16 Sep 2019 09:58:56 +0000 Subject: [PATCH] XML-RPC: Avoid a PHP warning in `wp_xmlrpc_server::minimum_args()` if `$args` is not an array. Correct the documentation to clarify that array is the only acceptable type for `$args`. Props bitcomplex, dkarfa. Fixes #48046. Built from https://develop.svn.wordpress.org/trunk@46148 git-svn-id: http://core.svn.wordpress.org/trunk@45960 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-xmlrpc-server.php | 6 +++--- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index 5142efad8c..871e8870bb 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -727,12 +727,12 @@ class wp_xmlrpc_server extends IXR_Server { * * @since 3.4.0 * - * @param string|array $args Sanitize single string or array of strings. - * @param int $count Minimum number of arguments. + * @param array $args An array of arguments to check. + * @param int $count Minimum number of arguments. * @return bool if `$args` contains at least $count arguments. */ protected function minimum_args( $args, $count ) { - if ( count( $args ) < $count ) { + if ( ! is_array( $args ) || count( $args ) < $count ) { $this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) ); return false; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 01dce759ee..c4f1f3a367 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-46147'; +$wp_version = '5.3-alpha-46148'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.