Ticket #39048: wp_parse_str_undifeied_vars.3.patch

src/wp-includes/functions.php

@@ -3429 +3429 @@
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-        if ( is_object( $args ) )
+        if ( is_object( $args ) ) {
                 $r = get_object_vars( $args );
-        elseif ( is_array( $args ) )
+        } elseif ( is_array( $args ) ) {
+
                 $r =& $args;
-        else
+        } else {
+                $r = array();
                 wp_parse_str( $args, $r );
+        }
 
+
         if ( is_array( $defaults ) )
                 return array_merge( $defaults, $r );
         return $r;

src/wp-includes/general-template.php

@@ -3277 +3277 @@
                 // Find the format argument.
                 $format = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
                 $format_query = isset( $format[1] ) ? $format[1] : '';
+                $format_args = array();
                 wp_parse_str( $format_query, $format_args );
 
                 // Find the query args of the requested URL.
+                $url_query_args = array();
                 wp_parse_str( $url_parts[1], $url_query_args );
 
                 // Remove the format argument from the array of query arguments, to avoid overwriting custom format.

src/wp-includes/script-loader.php

@@ -1030 +1030 @@
 
                 $parsed = parse_url( $src );
                 if ( isset($parsed['query']) && $parsed['query'] ) {
+                        $qv = array();
                         wp_parse_str( $parsed['query'], $qv );
                         $url = add_query_arg( $qv, $url );
                 }

tests/phpunit/tests/functions.php

@@ -35 +35 @@
 
         function test_wp_parse_args_other() {
                 $b = true;
+                $s = array();
                 wp_parse_str($b, $s);
                 $this->assertEquals($s, wp_parse_args($b));
                 $q = 'x=5&_baba=dudu&';
+                $ss = array();
                 wp_parse_str($q, $ss);
                 $this->assertEquals($ss, wp_parse_args($q));
         }