Ticket #18322: 18322.2.diff

src/wp-includes/class-wp-request.php

@@ +1 @@
+<?php
+/**
+ * WordPress Request API.
+ *
+ * @package WordPress
+ */
+
+/**
+ * WordPress Request class.
+ *
+ * Core class used to implement unslashed GET, POST, COOKIE, SERVER, REQUEST functionality.
+ *
+ * @since 5.0.0
+ */
+final class WP_Request {
+  /**
+         * Unslashed GET superglobal.
+         *
+         * @since 5.0.0
+         * @var array
+         */
+        private $get = array();
+
+        /**
+         * Unslashed POST superglobal.
+         *
+         * @since 5.0.0
+         * @var array
+         */
+        private $post = array();
+
+        /**
+         * Unslashed COOKIE superglobal.
+         *
+         * @since 5.0.0
+         * @var array
+         */
+        private $cookie = array();
+
+        /**
+         * Unslashed server superglobal.
+         *
+         * @since 5.0.0
+         * @var array
+         */
+        private $server = array();
+
+        /**
+         * Unslashed REQUEST superglobal.
+         *
+         * @since 5.0.0
+         * @var array
+         */
+        private $request = array();
+
+  /**
+         * Static instance of this class.
+         *
+         * @since 5.0.0
+         * @var $this
+         */
+  private static $instance = null;
+
+  /**
+   * Class constructor. Set superglobals.
+   *
+   * @since 5.0.0
+   */
+  private function __construct() {
+    $this->get     = $_GET;
+    $this->post    = $_POST;
+    $this->cookie  = $_COOKIE;
+    $this->server  = $_SERVER;
+    $this->request = $_REQUEST;
+  }
+
+  /**
+   * Return an instance of the WP_Request class.
+   *
+   * @since 5.0.0
+   *
+   * @return WP_Request An instance of this class.
+   */
+  public static function getInstance() {
+    if( null === self::$instance ) {
+      self::$instance = new WP_Request();
+    }
+    return self::$instance;
+  }
+
+  /**
+   * Declared to prevent cloning of the class.
+   *
+   * @since 5.0.0
+   */
+  private function __clone() {}
+
+  /**
+   * Declared to prevent unserializing of the class.
+   *
+   * @since 5.0.0
+   */
+  private function __wakeup() {}
+
+  /**
+   * Retrieve an unslashed GET variable.
+   *
+   * @since 5.0.0
+   * @param string $key GET variable string.
+   * @return mixed GET variable if one is set. Otherwise null.
+   */
+  public function get( $key ) {
+    return $this->retrieve( 'get', $key );
+  }
+
+  /**
+   * Retrieve an unslashed POST variable.
+   *
+   * @since 5.0.0
+   * @param string $key POST variable string.
+   * @return mixed POST variable if one is set. Otherwise null.
+   */
+  public function post( $key ) {
+    return $this->retrieve( 'post', $key );
+  }
+
+  /**
+   * Retrieve an unslashed COOKIE variable.
+   *
+   * @since 5.0.0
+   * @param string $key COOKIE variable string.
+   * @return mixed COOKIE variable if one is set. Otherwise null.
+   */
+  public function cookie( $key ) {
+    return $this->retrieve( 'cookie', $key );
+  }
+
+  /**
+   * Retrieve an unslashed SERVER variable.
+   *
+   * @since 5.0.0
+   * @param string $key SERVER variable string.
+   * @return mixed SERVER variable if one is set. Otherwise null.
+   */
+  public function server( $key ) {
+    return $this->retrieve( 'server', $key );
+  }
+
+  /**
+   * Retrieve an unslashed REQUEST variable.
+   *
+   * @since 5.0.0
+   * @param string $key REQUEST variable string.
+   * @return mixed REQUEST variable if one is set. Otherwise null.
+   */
+  public function request( $key ) {
+    return $this->retrieve( 'request', $key );
+  }
+
+  /**
+   * Retrieve an unslashed variable.
+   *
+   * @since 5.0.0
+   * @param string $kind Which of the globals to retrieve: get, post, cookie, server, or request.
+   * @param string $key  Variable string.
+   * @return mixed Variable if one is set. Otherwise null.
+   */
+  private function retrieve( $kind, $key ) {
+    return is_string( $key ) && isset( $this->$kind[ $key ] ) ? $this->$kind[ $key ] : null;
+  }
+}

src/wp-includes/functions.php

@@ -6075 +6075 @@
                 ), $email_change_email['message'], $email_change_email['headers']
         );
 }
+
+/**
+ * Return the unslashed GET variable.
+ *
+ * @since 5.0.0
+ *
+ * @param string $key GET variable string
+ * @return mixed GET variable if one is set. Otherwise null.
+ */
+function _GET( $val ) {
+        return WP_Request::getInstance()->get( $val );
+}
+
+/**
+ * Return the unslashed POST variable.
+ *
+ * @since 5.0.0
+ *
+ * @param string $key POST variable string
+ * @return mixed POST variable if one is set. Otherwise null.
+ */
+function _POST( $val ) {
+        return WP_Request::getInstance()->post( $val );
+}
+
+/**
+ * Return the unslashed COOKIE variable.
+ *
+ * @since 5.0.0
+ *
+ * @param string $key COOKIE variable string
+ * @return mixed COOKIE variable if one is set. Otherwise null.
+ */
+function _COOKIE( $val ) {
+        return WP_Request::getInstance()->cookie( $val );
+}
+
+/**
+ * Return the unslashed SERVER variable.
+ *
+ * @since 5.0.0
+ *
+ * @param string $key SERVER variable string
+ * @return mixed SERVER variable if one is set. Otherwise null.
+ */
+function _SERVER( $val ) {
+        return WP_Request::getInstance()->server( $val );
+}
+
+/**
+ * Return the unslashed REQUEST variable.
+ *
+ * @since 5.0.0
+ *
+ * @param string $key REQUEST variable string
+ * @return mixed REQUEST variable if one is set. Otherwise null.
+ */
+function _REQUEST( $val ) {
+        return WP_Request::getInstance()->request( $val );
+}

src/wp-settings.php

@@ -149 +149 @@
 require( ABSPATH . WPINC . '/class-wp-role.php' );
 require( ABSPATH . WPINC . '/class-wp-user.php' );
 require( ABSPATH . WPINC . '/class-wp-query.php' );
+require( ABSPATH . WPINC . '/class-wp-request.php' );
 require( ABSPATH . WPINC . '/query.php' );
 require( ABSPATH . WPINC . '/date.php' );
 require( ABSPATH . WPINC . '/theme.php' );
@@ -256 +257 @@
 
 $GLOBALS['wp_plugin_paths'] = array();
 
+/**
+ * WordPress Request object.
+ *
+ * Get superglobals before `wp_magic_quotes()` obliterates them.
+ *
+ * @global WP_Request $wp_request
+ * @since 5.0.0
+ */
+$GLOBALS[ 'wp_request' ] = WP_Request::getInstance();
+
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
         include_once( $mu_plugin );