WordPress.org
Get WordPress

Make WordPress Core

Ticket #49810: 49810.diff

File 49810.diff, 2.6 KB (added by desrosj, 5 years ago)

  • src/wp-includes/IXR/class-IXR-server.php 

    diff --git a/src/wp-includes/IXR/class-IXR-server.php b/src/wp-includes/IXR/class-IXR-server.php
index 9702ba28b7..3112d23815 100644
    a b function serve($data = false) 
    4747                die('XML-RPC server accepts POST requests only.');
    4848            }
    4949
    50             global $HTTP_RAW_POST_DATA;
    51             if (empty($HTTP_RAW_POST_DATA)) {
    52                 // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
    53                 $data = file_get_contents('php://input');
    54             } else {
    55                 $data =& $HTTP_RAW_POST_DATA;
    56             }
     50            $data = file_get_contents('php://input');
    5751        }
    5852        $this->message = new IXR_Message($data);
    5953        if (!$this->message->parse()) {

  • src/wp-includes/rest-api/class-wp-rest-server.php 

    diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
index 0ab94bbbde..a7c43b041f 100644
    a b public function remove_header( $key ) { 
    13711371         * @return string Raw request data.
    13721372         */
    13731373        public static function get_raw_data() {
     1374                // phpcs:disable PHPCompatibility.Variables.RemovedPredefinedGlobalVariables.http_raw_post_dataDeprecatedRemoved
    13741375                global $HTTP_RAW_POST_DATA;
    13751376
    1376                 /*
    1377                  * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
    1378                  * but we can do it ourself.
    1379                  */
     1377                // $HTTP_RAW_POST_DATA was deprecated in PHP 5.6 and removed in PHP 7.0.
    13801378                if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
    13811379                        $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
    13821380                }
    13831381
    13841382                return $HTTP_RAW_POST_DATA;
     1383                // phpcs:enable
    13851384        }
    13861385
    13871386        /**

  • src/xmlrpc.php 

    diff --git a/src/xmlrpc.php b/src/xmlrpc.php
index 00bd97e8df..341a6dc84d 100644
    a b  
    1515// Some browser-embedded clients send cookies. We don't want them.
    1616$_COOKIE = array();
    1717
    18 // A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
    19 // but we can do it ourself.
     18// $HTTP_RAW_POST_DATA was deprecated in PHP 5.6 and removed in PHP 7.0.
     19// phpcs:disable PHPCompatibility.Variables.RemovedPredefinedGlobalVariables.http_raw_post_dataDeprecatedRemoved
    2020if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
    2121        $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
    2222}
    … …  
    2525if ( isset( $HTTP_RAW_POST_DATA ) ) {
    2626        $HTTP_RAW_POST_DATA = trim( $HTTP_RAW_POST_DATA );
    2727}
     28// phpcs:enable
    2829
    2930/** Include the bootstrap for setting up WordPress environment */
    3031require_once __DIR__ . '/wp-load.php';