From 3cd585a457c4ea0fbf41161d662e09b6dcbe585f Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 10 Feb 2015 23:37:28 +0000
Subject: [PATCH] oEmbed discovery fails on XHTML head links, adjust the regex
 to not match `/`.

Props cweiske.
Fixes #31212.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31388 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 e5bc4a7627..34919fc08e 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -347,7 +347,7 @@ class WP_oEmbed {
 				}
 			}
 
-			if ( $tagfound && preg_match_all( '/<link([^<>]+)>/i', $html, $links ) ) {
+			if ( $tagfound && preg_match_all( '#<link([^<>]+)/?>#iU', $html, $links ) ) {
 				foreach ( $links[1] as $link ) {
 					$atts = shortcode_parse_atts( $link );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d3aceb1c52..c50cc538a5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31406';
+$wp_version = '4.2-alpha-31407';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.