From 02d04f2b5c61bd770d6ce4875ac25b2ad8da0c45 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Fri, 22 Dec 2017 03:18:47 +0000
Subject: [PATCH] WP: Don't attempt to convert multiple-nested arrays to a
 string in WP->parse_request().

See #14330.
Fixes #42752.

Built from https://develop.svn.wordpress.org/trunk@42419


git-svn-id: http://core.svn.wordpress.org/trunk@42250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp.php | 2 +-
 wp-includes/version.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 5298ff21ab..47ed0a04b4 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -308,7 +308,7 @@ class WP {
 					$this->query_vars[ $wpvar ] = (string) $this->query_vars[ $wpvar ];
 				} else {
 					foreach ( $this->query_vars[ $wpvar ] as $vkey => $v ) {
-						if ( ! is_object( $v ) ) {
+						if ( is_scalar( $v ) ) {
 							$this->query_vars[ $wpvar ][ $vkey ] = (string) $v;
 						}
 					}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 39cff7dc9c..ed39cdd43a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42417';
+$wp_version = '5.0-alpha-42419';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.