From cd4fc46cf2d983272f7e97089871eb328eef673c Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 11 Feb 2015 16:13:26 +0000
Subject: [PATCH] oEmbed discovery fails on encoded link URLs: decode HTML
 chars in the HTML-encoded URLs that are returned.

Props cweiske.
Fixes #31213.

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


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

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 34919fc08e..f5b558b322 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -352,7 +352,7 @@ class WP_oEmbed {
 					$atts = shortcode_parse_atts( $link );
 
 					if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) {
-						$providers[$linktypes[$atts['type']]] = $atts['href'];
+						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
 
 						// Stop here if it's JSON (that's all we need)
 						if ( 'json' == $linktypes[$atts['type']] )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7e6040eb59..1741c064b3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31412';
+$wp_version = '4.2-alpha-31413';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.