diff --git a/wp-includes/IXR/class-IXR-server.php b/wp-includes/IXR/class-IXR-server.php index 9702ba28b7..3112d23815 100644 --- a/wp-includes/IXR/class-IXR-server.php +++ b/wp-includes/IXR/class-IXR-server.php @@ -47,13 +47,7 @@ class IXR_Server die('XML-RPC server accepts POST requests only.'); } - global $HTTP_RAW_POST_DATA; - if (empty($HTTP_RAW_POST_DATA)) { - // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293 - $data = file_get_contents('php://input'); - } else { - $data =& $HTTP_RAW_POST_DATA; - } + $data = file_get_contents('php://input'); } $this->message = new IXR_Message($data); if (!$this->message->parse()) { diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php index 0ab94bbbde..a7c43b041f 100644 --- a/wp-includes/rest-api/class-wp-rest-server.php +++ b/wp-includes/rest-api/class-wp-rest-server.php @@ -1371,17 +1371,16 @@ class WP_REST_Server { * @return string Raw request data. */ public static function get_raw_data() { + // phpcs:disable PHPCompatibility.Variables.RemovedPredefinedGlobalVariables.http_raw_post_dataDeprecatedRemoved global $HTTP_RAW_POST_DATA; - /* - * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default, - * but we can do it ourself. - */ + // $HTTP_RAW_POST_DATA was deprecated in PHP 5.6 and removed in PHP 7.0. if ( ! isset( $HTTP_RAW_POST_DATA ) ) { $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' ); } return $HTTP_RAW_POST_DATA; + // phpcs:enable } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index e8b649e760..4a21a973bc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47925'; +$wp_version = '5.5-alpha-47926'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/xmlrpc.php b/xmlrpc.php index 00bd97e8df..341a6dc84d 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -15,8 +15,8 @@ define( 'XMLRPC_REQUEST', true ); // Some browser-embedded clients send cookies. We don't want them. $_COOKIE = array(); -// A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default, -// but we can do it ourself. +// $HTTP_RAW_POST_DATA was deprecated in PHP 5.6 and removed in PHP 7.0. +// phpcs:disable PHPCompatibility.Variables.RemovedPredefinedGlobalVariables.http_raw_post_dataDeprecatedRemoved if ( ! isset( $HTTP_RAW_POST_DATA ) ) { $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' ); } @@ -25,6 +25,7 @@ if ( ! isset( $HTTP_RAW_POST_DATA ) ) { if ( isset( $HTTP_RAW_POST_DATA ) ) { $HTTP_RAW_POST_DATA = trim( $HTTP_RAW_POST_DATA ); } +// phpcs:enable /** Include the bootstrap for setting up WordPress environment */ require_once __DIR__ . '/wp-load.php';