Ticket #22325: 22325.2.diff

wp-includes/class-wp.php

@@ -84 +84 @@
         var $did_permalink = false;
 
         /**
+         * Unslashed GET superglobal
+         *
+         * @since 3.6.0
+         * @var array
+         */
+        public static $GET = array();
+
+        /**
+         * Unslashed POST superglobal
+         *
+         * @since 3.6.0
+         * @var array
+         */
+        public static $POST = array();
+
+        /**
+         * Unslashed REQUEST superglobal
+         *
+         * @since 3.6.0
+         * @var array
+         */
+        public static $REQUEST = array();
+
+        /**
          * Add name to list of public query variables.
          *
          * @since 2.1.0
@@ -552 +576 @@
                 do_action_ref_array('wp', array(&$this));
         }
 
+        /**
+         * Retrieve an unslashed GET variable
+         *
+         * @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) {
+                if ( isset( self::$GET[ $key] ) )
+                        return self::$GET[ $key ];
+
+                return $default;
+        }
+
+        /**
+         * Retrieve an unslashed POST variable
+         *
+         * @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) {
+                if ( isset( self::$POST[ $key] ) )
+                        return self::$POST[ $key ];
+
+                return $default;
+        }
+
+        /**
+         * Retrieve an unslashed REQUEST variable
+         *
+         * @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) {
+                if ( isset( self::$REQUEST[ $key] ) )
+                        return self::$REQUEST[ $key ];
+
+                return $default;
+        }
 }
 
 /**

wp-includes/load.php

@@ -537 +537 @@
                 $_COOKIE = stripslashes_deep( $_COOKIE );
         }
 
+        // During setup, we don't have a global request object
+        if ( class_exists( 'WP' ) ) {
+                // Store the unslashed superglobals
+                WP::$GET     = $_GET;
+                WP::$POST    = $_POST;
+                WP::$REQUEST = array_merge( $_GET, $_POST );
+        }
+
         // Escape with wpdb.
         $_GET    = add_magic_quotes( $_GET    );
         $_POST   = add_magic_quotes( $_POST   );