From da7359b060eda9ea8bc23ad08455379febbabe46 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 5 Mar 2015 16:26:25 +0000
Subject: [PATCH] After [31620], when checking for HTTP URLs, make sure we are
 checking the shortcode body instead of an indexed attribute.

See #31139.

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


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

diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index 7678a7fd15..b576badc7f 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -2711,8 +2711,8 @@ function wp_ajax_parse_embed() {
 
 	preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
 	$atts = shortcode_parse_atts( $matches[3] );
-	if ( ! empty( $atts[5] ) ) {
-		$url = $atts[5];
+	if ( ! empty( $matches[5] ) ) {
+		$url = $matches[5];
 	} elseif ( ! empty( $atts['src'] ) ) {
 		$url = $atts['src'];
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 142eab9ecf..95fed6bf33 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31625';
+$wp_version = '4.2-alpha-31626';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.