From 481352bd2ec44764de1630156b92b1e633a8b9a6 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Wed, 1 Apr 2015 19:40:26 +0000
Subject: [PATCH] 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
---
 wp-includes/functions.php | 5 +++--
 wp-includes/version.php   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 42f6873b64..388922cb90 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -781,8 +781,9 @@ function add_query_arg() {
 	wp_parse_str( $query, $qs );
 	$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_replace( $qs, $kayvees );
+		foreach ( $args[0] as $k => $v ) {
+			$qs[ $k ] = $v;
+		}
 	} else {
 		$qs[ $args[0] ] = $args[1];
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b9e6605b4f..cc89bc611f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.