<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35437] trunk: Embeds: Provide a cached text fallback.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35437">35437</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35437","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-29 23:10:46 +0000 (Thu, 29 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/34462">#34462</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesembedfunctionsphp">trunk/src/wp-includes/embed-functions.php</a></li>
<li><a href="#trunksrcwpincludesjswpembedjs">trunk/src/wp-includes/js/wp-embed.js</a></li>
<li><a href="#trunktestsphpunittestsoembedfilterResultphp">trunk/tests/phpunit/tests/oembed/filterResult.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2015-10-29 22:50:13 UTC (rev 35436)
+++ trunk/src/wp-includes/default-filters.php 2015-10-29 23:10:46 UTC (rev 35437)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'esc_html' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content_feed', 'wp_staticize_emoji' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'the_content_feed', '_oembed_filter_feed_content' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_rss', 'convert_chars' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_author_rss', 'ent2ncr', 8 );
</span></span></pre></div>
<a id="trunksrcwpincludesembedfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed-functions.php 2015-10-29 22:50:13 UTC (rev 35436)
+++ trunk/src/wp-includes/embed-functions.php 2015-10-29 23:10:46 UTC (rev 35437)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,7 +461,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $embed_url = get_post_embed_url( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = "<script type='text/javascript'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = '<blockquote><a href="' . get_permalink( $post ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
+
+ $output .= "<script type='text/javascript'>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "<!--//--><![CDATA[//><!--\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SCRIPT_DEBUG ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,7 +754,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'iframe' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a' => array(
+ 'href' => true,
+ ),
+ 'blockquote' => array(),
+ 'iframe' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'src' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,14 +772,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = wp_kses( $result, $allowed_html );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '|^.*(<iframe.*?></iframe>).*$|m', $html, $iframes );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $iframes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match( '|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content );
+ // We require at least the iframe to exist.
+ if ( empty( $content[2] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = $content[1] . $content[2];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $iframes[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $html );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $results ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,6 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = esc_url( "{$results[1]}#?secret=$secret" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $html;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,3 +924,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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 );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjswpembedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wp-embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-embed.js 2015-10-29 22:50:13 UTC (rev 35436)
+++ trunk/src/wp-includes/js/wp-embed.js 2015-10-29 23:10:46 UTC (rev 35437)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,14 +13,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var iframes = document.querySelectorAll( '.wp-embedded-content[data-secret="' + data.secret + '"]' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
+ blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
+ i, source, height, sourceURL, targetURL;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( var i = 0; i < iframes.length; i++ ) {
- var source = iframes[ i ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( i = 0; i < blockquotes.length; i++ ) {
+ blockquotes[ i ].style.display = 'none';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( i = 0; i < iframes.length; i++ ) {
+ source = iframes[ i ];
+
+ source.style.display = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Resize the iframe on request. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'height' === data.message ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var height = data.value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height = data.value;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( height > 1000 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> height = 1000;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( height < 200 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +40,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Link to a specific URL on request. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'link' === data.message ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var sourceURL = document.createElement( 'a' ), targetURL = document.createElement( 'a' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sourceURL = document.createElement( 'a' );
+ targetURL = document.createElement( 'a' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> sourceURL.href = source.getAttribute( 'src' );
</span><span class="cx" style="display: block; padding: 0 10px"> targetURL.href = data.value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,13 +58,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function onLoad() {
</span><span class="cx" style="display: block; padding: 0 10px"> var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ ),
+ iframes, iframeClone, i;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Remove security attribute from iframes in IE10 and IE11. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isIE10 || isIE11 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var iframes = document.querySelectorAll( '.wp-embedded-content[security]' ), iframeClone;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframes = document.querySelectorAll( '.wp-embedded-content[security]' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( var i = 0; i < iframes.length; i++ ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( i = 0; i < iframes.length; i++ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> iframeClone = iframes[ i ].cloneNode( true );
</span><span class="cx" style="display: block; padding: 0 10px"> iframeClone.removeAttribute( 'security' );
</span><span class="cx" style="display: block; padding: 0 10px"> iframes[ i ].parentNode.insertBefore( iframeClone, iframes[ i ].nextSibling );
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedfilterResultphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/filterResult.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/filterResult.php 2015-10-29 22:50:13 UTC (rev 35436)
+++ trunk/tests/phpunit/tests/oembed/filterResult.php 2015-10-29 23:10:46 UTC (rev 35437)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,4 +78,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_filter_oembed_result( false, (object) array( 'type' => 'rich' ), '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_filter_oembed_result( '', (object) array( 'type' => 'rich' ), '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ function test_filter_oembed_result_blockquote_adds_style_to_iframe() {
+ $html = '<blockquote></blockquote><iframe></iframe>';
+ $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
+
+ $this->assertEquals( '<blockquote></blockquote><iframe sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
+ }
+
+ function test_filter_oembed_result_allowed_html() {
+ $html = '<blockquote><strong><a href="" target=""></a></strong></blockquote><iframe></iframe>';
+ $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
+
+ $this->assertEquals( '<blockquote><a href=""></a></blockquote><iframe sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>