From d50ac5598f237341a223ea382bb3dbe90df5c9ef Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 15 Jun 2016 18:52:28 +0000
Subject: [PATCH] Embeds: In `WP_oEmbed::get_provider()` and
 `WP_oEmbed::get_html()`, parse the `$args` string to an array, as we treat it
 as an array later.

See #37071.
Built from https://develop.svn.wordpress.org/trunk@37720


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

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 6bdc925e63..9790d266f6 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -221,6 +221,7 @@ class WP_oEmbed {
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
 	public function get_provider( $url, $args = '' ) {
+		$args = wp_parse_args( $args );
 
 		$provider = false;
 
@@ -315,6 +316,8 @@ class WP_oEmbed {
 	 * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
 	 */
 	public function get_html( $url, $args = '' ) {
+		$args = wp_parse_args( $args );
+
 		/**
 		 * Filters the oEmbed result before any HTTP requests are made.
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ecbdb2e9d..4567f4f8f0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37719';
+$wp_version = '4.6-alpha-37720';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.