Changeset 31966

Timestamp:

04/01/2015 07:14:46 PM (10 years ago)

Author:

wonderboymusic

Message:

Respect numerical keys in add_query_arg(), use array_replace() instead of array_merge().

Adds unit test.

Props tyxla.
Fixes #31306.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -783 +783 @@
     if ( is_array( $args[0] ) ) {
         $kayvees = $args[0];
-        $qs = array_merge( $qs, $kayvees );
+        $qs = array_replace( $qs, $kayvees );
     } else {
         $qs[ $args[0] ] = $args[1];

trunk/tests/phpunit/tests/functions.php

@@ -257 +257 @@
 
         $_SERVER['REQUEST_URI'] = $old_req_uri;
+    }
+
+    /**
+     * @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);
     }