From 368e5f9fc3b63f205aa1a9f7ccec2b220d7a3662 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 29 Oct 2015 23:11:24 +0000
Subject: [PATCH] Embeds: Provide a cached text fallback.

Sometimes, embedded sites might suffer from less than 100% uptime. Instead of leaving the embedding site with a big blank space where the embed should be, let's fall back to a link to the embedded post, so there's at least some context for the post.

Fixes #34462.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/default-filters.php |  1 +
 wp-includes/embed-functions.php | 39 ++++++++++++++++++++++++++++-----
 wp-includes/js/wp-embed.js      | 27 ++++++++++++++++-------
 wp-includes/js/wp-embed.min.js  |  2 +-
 wp-includes/version.php         |  2 +-
 5 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 70a9791ebc..75a171b4b0 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -165,6 +165,7 @@ add_filter( 'the_title_rss',      'ent2ncr',                    8 );
 add_filter( 'the_title_rss',      'esc_html'                      );
 add_filter( 'the_content_rss',    'ent2ncr',                    8 );
 add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
+add_filter( 'the_content_feed',   '_oembed_filter_feed_content'   );
 add_filter( 'the_excerpt_rss',    'convert_chars'                 );
 add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
 add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
diff --git a/wp-includes/embed-functions.php b/wp-includes/embed-functions.php
index f28ed8692b..ebe15c5105 100644
--- a/wp-includes/embed-functions.php
+++ b/wp-includes/embed-functions.php
@@ -461,7 +461,9 @@ function get_post_embed_html( $post = null, $width, $height ) {
 
 	$embed_url = get_post_embed_url( $post );
 
-	$output = "<script type='text/javascript'>\n";
+	$output = '<blockquote><a href="' . get_permalink( $post ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
+
+	$output .= "<script type='text/javascript'>\n";
 	$output .= "<!--//--><![CDATA[//><!--\n";
 	if ( SCRIPT_DEBUG ) {
 		$output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
@@ -477,7 +479,7 @@ function get_post_embed_html( $post = null, $width, $height ) {
 		 * and edit wp-embed.js directly.
 		 */
 		$output .=<<<JS
-		!function(a,b){"use strict";function c(){var a=-1!==navigator.appVersion.indexOf("MSIE 10"),c=!!navigator.userAgent.match(/Trident.*rv\:11\./);if(a||c)for(var d,e=b.querySelectorAll(".wp-embedded-content[security]"),f=0;f<e.length;f++)d=e[f].cloneNode(!0),d.removeAttribute("security"),e[f].parentNode.insertBefore(d,e[f].nextSibling),e[f].parentNode.removeChild(e[f])}a.wp=a.wp||{},a.wp.receiveEmbedMessage||(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value)for(var e=b.querySelectorAll('.wp-embedded-content[data-secret="'+d.secret+'"]'),f=0;f<e.length;f++){var g=e[f];if("height"===d.message){var h=d.value;h>1e3?h=1e3:200>h&&(h=200),g.height=h+"px"}if("link"===d.message){var i=b.createElement("a"),j=b.createElement("a");i.href=g.getAttribute("src"),j.href=d.value,j.host===i.host&&b.activeElement===g&&(a.top.location.href=d.value)}}},a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1))}(window,document);
+		!function(a,b){"use strict";function c(){var a,c,d,e=-1!==navigator.appVersion.indexOf("MSIE 10"),f=!!navigator.userAgent.match(/Trident.*rv\:11\./);if(e||f)for(a=b.querySelectorAll(".wp-embedded-content[security]"),d=0;d<a.length;d++)c=a[d].cloneNode(!0),c.removeAttribute("security"),a[d].parentNode.insertBefore(c,a[d].nextSibling),a[d].parentNode.removeChild(a[d])}a.wp=a.wp||{},a.wp.receiveEmbedMessage||(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value){var e,f,g,h,i,j=b.querySelectorAll('iframe[data-secret="'+d.secret+'"]'),k=b.querySelectorAll('blockquote[data-secret="'+d.secret+'"]');for(e=0;e<k.length;e++)k[e].style.display="none";for(e=0;e<j.length;e++)f=j[e],f.style.display="","height"===d.message&&(g=d.value,g>1e3?g=1e3:200>g&&(g=200),f.height=g+"px"),"link"===d.message&&(h=b.createElement("a"),i=b.createElement("a"),h.href=f.getAttribute("src"),i.href=d.value,i.host===h.host&&b.activeElement===f&&(a.top.location.href=d.value))}},a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1))}(window,document);
 JS;
 	}
 	$output .= "\n//--><!]]>";
@@ -752,7 +754,11 @@ function wp_filter_oembed_result( $result, $data, $url ) {
 	}
 
 	$allowed_html = array(
-		'iframe' => array(
+		'a'          => array(
+			        'href' => true,
+		),
+		'blockquote' => array(),
+		'iframe'     => array(
 			'src'          => true,
 			'width'        => true,
 			'height'       => true,
@@ -766,13 +772,20 @@ function wp_filter_oembed_result( $result, $data, $url ) {
 	);
 
 	$html = wp_kses( $result, $allowed_html );
-	preg_match( '|^.*(<iframe.*?></iframe>).*$|m', $html, $iframes );
 
-	if ( empty( $iframes ) ) {
+	preg_match( '|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content );
+	// We require at least the iframe to exist.
+	if ( empty( $content[2] ) ) {
 		return false;
 	}
+	$html = $content[1] . $content[2];
 
-	$html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $iframes[1] );
+	if ( ! empty( $content[1] ) ) {
+		// We have a blockquote to fall back on. Hide the iframe by default.
+		$html = str_replace( '<iframe', '<iframe style="display:none;"', $html );
+	}
+
+	$html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $html );
 
 	preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
 
@@ -782,6 +795,7 @@ function wp_filter_oembed_result( $result, $data, $url ) {
 		$url = esc_url( "{$results[1]}#?secret=$secret" );
 
 		$html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
+		$html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
 	}
 
 	return $html;
@@ -910,3 +924,16 @@ function print_embed_scripts() {
 	</script>
 	<?php
 }
+
+/**
+ * Prepare the oembed HTML to be displayed in an RSS feed.
+ *
+ * @since 4.4.0
+ * @access private
+ *
+ * @param string $content The content to filter.
+ * @return string The filtered content.
+ */
+function _oembed_filter_feed_content( $content ) {
+	return str_replace( '<iframe sandbox="allow-scripts" security="restricted" style="display:none;"', '<iframe sandbox="allow-scripts" security="restricted"', $content );
+}
diff --git a/wp-includes/js/wp-embed.js b/wp-includes/js/wp-embed.js
index dd03bc0eba..3829d0d9da 100644
--- a/wp-includes/js/wp-embed.js
+++ b/wp-includes/js/wp-embed.js
@@ -13,14 +13,22 @@
 			return;
 		}
 
-		var iframes = document.querySelectorAll( '.wp-embedded-content[data-secret="' + data.secret + '"]' );
+		var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
+			blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
+			i, source, height, sourceURL, targetURL;
 
-		for ( var i = 0; i < iframes.length; i++ ) {
-			var source = iframes[ i ];
+		for ( i = 0; i < blockquotes.length; i++ ) {
+			blockquotes[ i ].style.display = 'none';
+		}
+
+		for ( i = 0; i < iframes.length; i++ ) {
+			source = iframes[ i ];
+
+			source.style.display = '';
 
 			/* Resize the iframe on request. */
 			if ( 'height' === data.message ) {
-				var height = data.value;
+				height = data.value;
 				if ( height > 1000 ) {
 					height = 1000;
 				} else if ( height < 200 ) {
@@ -32,7 +40,9 @@
 
 			/* Link to a specific URL on request. */
 			if ( 'link' === data.message ) {
-				var sourceURL = document.createElement( 'a' ), targetURL = document.createElement( 'a' );
+				sourceURL = document.createElement( 'a' );
+				targetURL = document.createElement( 'a' );
+
 				sourceURL.href = source.getAttribute( 'src' );
 				targetURL.href = data.value;
 
@@ -48,13 +58,14 @@
 
 	function onLoad() {
 		var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ),
-			isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ );
+			isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ ),
+			iframes, iframeClone, i;
 
 		/* Remove security attribute from iframes in IE10 and IE11. */
 		if ( isIE10 || isIE11 ) {
-			var iframes = document.querySelectorAll( '.wp-embedded-content[security]' ), iframeClone;
+			iframes = document.querySelectorAll( '.wp-embedded-content[security]' );
 
-			for ( var i = 0; i < iframes.length; i++ ) {
+			for ( i = 0; i < iframes.length; i++ ) {
 				iframeClone = iframes[ i ].cloneNode( true );
 				iframeClone.removeAttribute( 'security' );
 				iframes[ i ].parentNode.insertBefore( iframeClone, iframes[ i ].nextSibling );
diff --git a/wp-includes/js/wp-embed.min.js b/wp-includes/js/wp-embed.min.js
index 71775415f4..545013fc6a 100644
--- a/wp-includes/js/wp-embed.min.js
+++ b/wp-includes/js/wp-embed.min.js
@@ -1 +1 @@
-!function(a,b){"use strict";function c(){var a=-1!==navigator.appVersion.indexOf("MSIE 10"),c=!!navigator.userAgent.match(/Trident.*rv\:11\./);if(a||c)for(var d,e=b.querySelectorAll(".wp-embedded-content[security]"),f=0;f<e.length;f++)d=e[f].cloneNode(!0),d.removeAttribute("security"),e[f].parentNode.insertBefore(d,e[f].nextSibling),e[f].parentNode.removeChild(e[f])}a.wp=a.wp||{},a.wp.receiveEmbedMessage||(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value)for(var e=b.querySelectorAll('.wp-embedded-content[data-secret="'+d.secret+'"]'),f=0;f<e.length;f++){var g=e[f];if("height"===d.message){var h=d.value;h>1e3?h=1e3:200>h&&(h=200),g.height=h+"px"}if("link"===d.message){var i=b.createElement("a"),j=b.createElement("a");i.href=g.getAttribute("src"),j.href=d.value,j.host===i.host&&b.activeElement===g&&(a.top.location.href=d.value)}}},a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1))}(window,document);
\ No newline at end of file
+!function(a,b){"use strict";function c(){var a,c,d,e=-1!==navigator.appVersion.indexOf("MSIE 10"),f=!!navigator.userAgent.match(/Trident.*rv\:11\./);if(e||f)for(a=b.querySelectorAll(".wp-embedded-content[security]"),d=0;d<a.length;d++)c=a[d].cloneNode(!0),c.removeAttribute("security"),a[d].parentNode.insertBefore(c,a[d].nextSibling),a[d].parentNode.removeChild(a[d])}a.wp=a.wp||{},a.wp.receiveEmbedMessage||(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value){var e,f,g,h,i,j=b.querySelectorAll('iframe[data-secret="'+d.secret+'"]'),k=b.querySelectorAll('blockquote[data-secret="'+d.secret+'"]');for(e=0;e<k.length;e++)k[e].style.display="none";for(e=0;e<j.length;e++)f=j[e],f.style.display="","height"===d.message&&(g=d.value,g>1e3?g=1e3:200>g&&(g=200),f.height=g+"px"),"link"===d.message&&(h=b.createElement("a"),i=b.createElement("a"),h.href=f.getAttribute("src"),i.href=d.value,i.host===h.host&&b.activeElement===f&&(a.top.location.href=d.value))}},a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1))}(window,document);
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9bed31e941..a83bd850ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35436';
+$wp_version = '4.4-beta2-35437';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.