<!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>[35577] trunk: Embeds: Fix support for embedding in non-WordPress sites.</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/35577">35577</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/35577","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-11-09 00:07:03 +0000 (Mon, 09 Nov 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: Fix support for embedding in non-WordPress sites.
This moves the last of the iframe message code from PHP to JavaScript, so it can be included in any site, without needing to rely on any of WordPress' internal behaviour.
Props swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/34451">#34451</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesembedfunctionsphp">trunk/src/wp-includes/embed-functions.php</a></li>
<li><a href="#trunksrcwpincludesjswpembedtemplatejs">trunk/src/wp-includes/js/wp-embed-template.js</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="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-11-08 20:34:34 UTC (rev 35576)
+++ trunk/src/wp-includes/embed-functions.php 2015-11-09 00:07:03 UTC (rev 35577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</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 = '<blockquote><a href="' . get_permalink( $post ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = '<blockquote class="wp-embedded-content"><a href="' . esc_url( get_permalink( $post ) ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<script type='text/javascript'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<!--//--><![CDATA[//><!--\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_html = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blockquote' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'iframe' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,7 +766,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'marginheight' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'scrolling' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'class' => true,
</del><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,9 +781,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $content[1] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We have a blockquote to fall back on. Hide the iframe by default.
</span><span class="cx" style="display: block; padding: 0 10px"> $html = str_replace( '<iframe', '<iframe style="display:none;"', $html );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = str_replace( '<blockquote', '<blockquote class="wp-embedded-content"', $html );
</ins><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">- $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $html );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = str_replace( '<iframe', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $html );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,5 +956,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The filtered content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _oembed_filter_feed_content( $content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return str_replace( '<iframe sandbox="allow-scripts" security="restricted" style="display:none;"', '<iframe sandbox="allow-scripts" security="restricted"', $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_replace( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjswpembedtemplatejs"></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-template.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-embed-template.js 2015-11-08 20:34:34 UTC (rev 35576)
+++ trunk/src/wp-includes/js/wp-embed-template.js 2015-11-09 00:07:03 UTC (rev 35577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function ( window, document ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 'use strict';
</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 secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' ),
- supportedBrowser = ( document.querySelector && window.addEventListener ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var supportedBrowser = ( document.querySelector && window.addEventListener ),
</ins><span class="cx" style="display: block; padding: 0 10px"> loaded = false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ secret,
+ secretTimeout,
</ins><span class="cx" style="display: block; padding: 0 10px"> resizing;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function sendEmbedMessage( message, value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +178,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Re-get the secret when it was added later on.
+ */
+ function getSecret() {
+ if ( window.self === window.top || !!secret ) {
+ return;
+ }
+
+ secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' );
+
+ clearTimeout( secretTimeout );
+
+ secretTimeout = setTimeout( function () {
+ getSecret();
+ }, 100 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( supportedBrowser ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getSecret();
</ins><span class="cx" style="display: block; padding: 0 10px"> document.documentElement.className = document.documentElement.className.replace( /\bno-js\b/, '' ) + ' js';
</span><span class="cx" style="display: block; padding: 0 10px"> document.addEventListener( 'DOMContentLoaded', onLoad, false );
</span><span class="cx" style="display: block; padding: 0 10px"> window.addEventListener( 'load', onLoad, false );
</span></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-11-08 20:34:34 UTC (rev 35576)
+++ trunk/src/wp-includes/js/wp-embed.js 2015-11-09 00:07:03 UTC (rev 35577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,17 +64,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> loaded = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</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\./ ),
- iframes, iframeClone, i;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isIE11 = !!navigator.userAgent.match( /Trident.*rv:11\./ ),
+ iframes = document.querySelectorAll( 'iframe.wp-embedded-content' ),
+ blockquotes = document.querySelectorAll( 'blockquote.wp-embedded-content' ),
+ iframeClone, i, source, secret;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* Remove security attribute from iframes in IE10 and IE11. */
- if ( isIE10 || isIE11 ) {
- iframes = document.querySelectorAll( '.wp-embedded-content[security]' );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( i = 0; i < iframes.length; i++ ) {
- iframeClone = iframes[ i ].cloneNode( true );
</del><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 = '';
+
+ if ( !source.getAttribute( 'data-secret' ) ) {
+ /* Add secret to iframe */
+ secret = Math.random().toString( 36 ).substr( 2, 10 );
+ source.src += '#?secret=' + secret;
+ source.setAttribute( 'data-secret', secret );
+ }
+
+ /* Remove security attribute from iframes in IE10 and IE11. */
+ if ( ( isIE10 || isIE11 ) && !!source.getAttribute( 'security' ) ) {
+ iframeClone = source.cloneNode( true );
</ins><span class="cx" style="display: block; padding: 0 10px"> iframeClone.removeAttribute( 'security' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframes[ i ].parentNode.replaceChild( iframeClone, iframes[ i ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ source.parentNode.replaceChild( iframeClone, source );
</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"> }
</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-11-08 20:34:34 UTC (rev 35576)
+++ trunk/tests/phpunit/tests/oembed/filterResult.php 2015-11-09 00:07:03 UTC (rev 35577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '<div><iframe></iframe><iframe></iframe><p></p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '<iframe sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</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"> function test_filter_oembed_result_with_newlines() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '<iframe sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</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"> function test_filter_oembed_result_without_iframe() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,13 +83,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '<blockquote></blockquote><iframe></iframe>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '<blockquote></blockquote><iframe sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
</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"> function test_filter_oembed_result_allowed_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = '<blockquote><strong><a href="" target=""></a></strong></blockquote><iframe></iframe>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = '<blockquote class="foo" id="bar"><strong><a href="" target=""></a></strong></blockquote><iframe></iframe>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '<blockquote><a href=""></a></blockquote><iframe sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;"></iframe>', $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group feed
+ */
+ function test_filter_feed_content() {
+ $html = '<blockquote></blockquote><iframe></iframe>';
+ $actual = _oembed_filter_feed_content( wp_filter_oembed_result( $html, (object) array( 'type' => 'rich' ), '' ) );
+
+ $this->assertEquals( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>