Ticket #22325: 22325.3.diff

wp-includes/class-wp.php

@@ -84 +84 @@
         public $did_permalink = false;
 
         /**
+         * Unslashed GET superglobal
+         *
+         * @since 4.4.0
+         * @var array
+         */
+        private static $_GET = array();
+
+        /**
+         * Unslashed POST superglobal
+         *
+         * @since 4.4.0
+         * @var array
+         */
+        private static $_POST = array();
+
+        /**
+         * Unslashed REQUEST superglobal
+         *
+         * @since 4.4.0
+         * @var array
+         */
+        private static $_REQUEST = array();
+
+        /**
+         * Unslashed COOKIE superglobal
+         *
+         * @since 4.4.0
+         * @var array
+         */
+        private static $_COOKIE = array();
+
+        /**
+         * Unslashed SERVER superglobal
+         *
+         * @since 4.4.0
+         * @var array
+         */
+        private static $_SERVER = array();
+
+        /**
          * Add name to list of public query variables.
          *
          * @since 2.1.0
@@ -680 +720 @@
                  */
                 do_action_ref_array( 'wp', array( &$this ) );
         }
+
+        /**
+         * Initialize self::GET(), self::POST() and self::REQUEST().
+         *
+         * @note Can only be called once.
+         *
+         * @since 4.4.0
+         */
+        public static function _initialize_superglobals() {
+
+                static $initialized = false;
+
+                if ( ! $initialized ) {
+
+                        /**
+                         * Store the unslashed superglobals
+                         */
+                        self::$_GET     = $_GET;
+                        self::$_POST    = $_POST;
+                        self::$_REQUEST = array_merge( $_GET, $_POST );
+                        self::$_COOKIE  = $_COOKIE;
+                        self::$_SERVER  = $_SERVER;
+
+                        /**
+                         * Disallow this method to be called again
+                         */
+                        $initialized = true;
+
+                }
+
+        }
+
+        /**
+         * Retrieve an unslashed GET variable
+         *
+         * @since 4.4.0
+         *
+         * @param string $key    GET variable string
+         * @param mixed $default Default value to return
+         *
+         * @return string|array GET variable if one is set, default otherwise
+         */
+        public static function GET( $key, $default = null) {
+
+                return isset( self::$_GET[ $key ] ) ? self::$_GET[ $key ] : $default;
+
+        }
+
+        /**
+         * Retrieve an unslashed POST variable
+         *
+         * @since 4.4.0
+         * @param string $key POST variable string
+         * @param mixed $default Default value to return
+         * @return string|array POST variable if one is set, default otherwise
+         */
+        public static function POST( $key, $default = null) {
+
+                return isset( self::$_POST[ $key ] ) ? self::$_POST[ $key ] : $default;
+
+        }
+
+        /**
+         * Retrieve an unslashed REQUEST variable
+         *
+         * @since 4.4.0
+         * @param string $key REQUEST variable string
+         * @param mixed $default Default value to return
+         * @return string|array REQUEST variable if one is set, default otherwise
+         */
+        public static function REQUEST( $key, $default = null) {
+
+                return isset( self::$_REQUEST[ $key ] ) ? self::$_REQUEST[ $key ] : $default;
+
+        }
+
+        /**
+         * Retrieve an unslashed COOKIE variable
+         *
+         * @since 4.4.0
+         * @param string $key COOKIE variable string
+         * @param mixed $default Default value to return
+         * @return string|array COOKIE variable if one is set, default otherwise
+         */
+        public static function COOKIE( $key, $default = null) {
+
+                return isset( self::$_COOKIE[ $key ] ) ? self::$_COOKIE[ $key ] : $default;
+
+        }
+
+        /**
+         * Retrieve an unslashed SERVER variable
+         *
+         * @since 4.4.0
+         * @param string $key SERVER variable string
+         * @param mixed $default Default value to return
+         * @return string|array SERVER variable if one is set, default otherwise
+         */
+        public static function SERVER( $key, $default = null) {
+
+                return isset( self::$_SERVER[ $key ] ) ? self::$_SERVER[ $key ] : $default;
+
+        }
+
 }
 
 /**

wp-includes/load.php

@@ -590 +590 @@
                 $_COOKIE = stripslashes_deep( $_COOKIE );
         }
 
+        // During setup, we don't have a global request object
+        if ( class_exists( 'WP' ) ) {
+                // But when we do, initialize private properties of WP with values for the superglobals
+                WP::_initialize_superglobals();
+        }
+
         // Escape with wpdb.
         $_GET    = add_magic_quotes( $_GET    );
         $_POST   = add_magic_quotes( $_POST   );