Ticket #15112: 15112.diff

wp-includes/classes.php

@@ -263 +263 @@
                 foreach ( $this->public_query_vars as $wpvar ) {
                         if ( isset( $this->extra_query_vars[$wpvar] ) )
                                 $this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-                        elseif ( isset( $GLOBALS[$wpvar] ) )
-                                $this->query_vars[$wpvar] = $GLOBALS[$wpvar];
                         elseif ( isset( $_POST[$wpvar] ) )
                                 $this->query_vars[$wpvar] = $_POST[$wpvar];
                         elseif ( isset( $_GET[$wpvar] ) )
@@ -307 +305 @@
                 foreach ( (array) $this->private_query_vars as $var) {
                         if ( isset($this->extra_query_vars[$var]) )
                                 $this->query_vars[$var] = $this->extra_query_vars[$var];
-                        elseif ( isset($GLOBALS[$var]) && '' != $GLOBALS[$var] )
-                                $this->query_vars[$var] = $GLOBALS[$var];
                 }
 
                 if ( isset($error) )