Ticket #31306: 31306.patch

src/wp-includes/functions.php

@@ -782 +782 @@
         $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
         if ( is_array( $args[0] ) ) {
                 $kayvees = $args[0];
-                $qs = array_merge( $qs, $kayvees );
+                $qs = array_replace( $qs, $kayvees );
         } else {
                 $qs[ $args[0] ] = $args[1];
         }

tests/phpunit/tests/functions.php

@@ -246 +246 @@
         }
 
         /**
+         * @ticket 31306
+         */
+        function test_add_query_arg_numeric_keys() {
+                $url = add_query_arg( array( 'foo' => 'bar' ), '1=1' );
+                $this->assertEquals('1=1&foo=bar', $url);
+
+                $url = add_query_arg( array( 'foo' => 'bar', '1' => '2' ), '1=1' );
+                $this->assertEquals('1=2&foo=bar', $url);
+
+                $url = add_query_arg( array( '1' => '2' ), 'foo=bar' );
+                $this->assertEquals('foo=bar&1=2', $url);
+        }
+
+        /**
          * @ticket 21594
          */
         function test_get_allowed_mime_types() {