WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid the use of `array_replace()` in `add_query_arg()`. 

`array_replace()` was introduced PHP 5.3+. Instead, we walk the array manually.

See [31966].

Fixes #31306.
Built from https://develop.svn.wordpress.org/trunk@31967


git-svn-id: http://core.svn.wordpress.org/trunk@31946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-04-01 19:40:26 +00:00
parent c113cb5130
commit 481352bd2e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.php
View File

@ -781,8 +781,9 @@ function add_query_arg() {
wp_parse_str( $query, $qs ); wp_parse_str( $query, $qs );
$qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
if ( is_array( $args[0] ) ) { if ( is_array( $args[0] ) ) {
$kayvees = $args[0]; foreach ( $args[0] as $k => $v ) {
$qs = array_replace( $qs, $kayvees ); $qs[ $k ] = $v;
}
} else { } else {
$qs[ $args[0] ] = $args[1]; $qs[ $args[0] ] = $args[1];
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta3-31966'; $wp_version = '4.2-beta3-31967';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.