Ticket #27881: wp_reset_vars.diff

src/wp-admin/includes/misc.php

@@ -23 +23 @@
          * like nginx. Use the got_url_rewrite filter in got_url_rewrite() instead.
          *
          * @since 2.5.0
-         * 
+         *
          * @see got_url_rewrite()
          *
          * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
@@ -47 +47 @@
          * Filter whether URL rewriting is available.
          *
          * @since 3.7.0
-         * 
+         *
          * @param bool $got_url_rewrite Whether URL rewriting is available.
          */
         return apply_filters( 'got_url_rewrite', $got_url_rewrite );
@@ -274 +274 @@
  * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
-        for ( $i=0; $i<count( $vars ); $i += 1 ) {
-                $var = $vars[$i];
-                global $$var;
-
-                if ( empty( $_POST[$var] ) ) {
-                        if ( empty( $_GET[$var] ) )
-                                $$var = '';
-                        else
-                                $$var = $_GET[$var];
+        foreach ( $vars as $var ) {
+                if ( empty( $_POST[ $var ] ) ) {
+                        if ( empty( $_GET[ $var ] ) ) {
+                                $GLOBALS[ $var ] = '';
+                        } else {
+                                $GLOBALS[ $var ] = $_GET[ $var ];
+                        }
                 } else {
-                        $$var = $_POST[$var];
+                        $GLOBALS[ $var ] = $_POST[ $var ];
                 }
         }
 }