Ticket #20143: 20143.diff

wp-includes/canonical.php

@@ -292 +292 @@
                                 unset( $_parsed_query['name'] );
                 }
 
-                $_parsed_query = array_map( 'rawurlencode', $_parsed_query );
+                $_parsed_query = rawurlencode_deep( $_parsed_query );
                 $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
         }
 

wp-includes/formatting.php

@@ -1339 +1339 @@
 /**
  * Navigates through an array and encodes the values to be used in a URL.
  *
- * Uses a callback to pass the value of the array back to the function as a
- * string.
  *
  * @since 2.2.0
  *
@@ -1353 +1351 @@
 }
 
 /**
+ * Navigates through an array and raw encodes the values to be used in a URL.
+ *
+ * @since 3.4.0
+ *
+ * @param array|string $value The array or string to be encoded.
+ * @return array|string $value The encoded array (or string from the callback).
+ */
+function rawurlencode_deep( $value ) {
+        return is_array( $value ) ? array_map( 'rawurlencode_deep', $value ) : rawurlencode( $value );
+}
+
+/**
  * Converts email addresses characters to HTML entities to block spam bots.
  *
  * @since 0.71