<!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>[37732] branches/4.5: Embeds: Enforce a valid post ID when embedding a post from the current site.</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/37732">37732</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/37732","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-16 17:29:51 +0000 (Thu, 16 Jun 2016)</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: Enforce a valid post ID when embedding a post from the current site.
Otherwise `wp_filter_pre_oembed_result()` could erroneously return the HTML of the current post instead of the intended result.
Merge of <a href="https://core.trac.wordpress.org/changeset/37729">[37729]</a> to the 4.5 branch.
Props kraftbj.
See <a href="https://core.trac.wordpress.org/ticket/36767">#36767</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches45srcwpincludesembedphp">branches/4.5/src/wp-includes/embed.php</a></li>
<li><a href="#branches45testsphpunittestsoembedwpOembedphp">branches/4.5/tests/phpunit/tests/oembed/wpOembed.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches45">branches/4.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.5
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.5 2016-06-16 17:29:35 UTC (rev 37731)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.5 2016-06-16 17:29:51 UTC (rev 37732)
</ins><a id="branches45"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,37192,37228,37247,37249,37273,37282,37285,37288,37301,37352,37417,37433,37435,37448,37452,37472,37525-37526,37559,37708,37710,37724
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,37192,37228,37247,37249,37273,37282,37285,37288,37301,37352,37417,37433,37435,37448,37452,37472,37525-37526,37559,37708,37710,37724,37729
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches45srcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/src/wp-includes/embed.php 2016-06-16 17:29:35 UTC (rev 37731)
+++ branches/4.5/src/wp-includes/embed.php 2016-06-16 17:29:51 UTC (rev 37732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,6 +1100,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class-wp-oembed-controller.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = apply_filters( 'oembed_request_post_id', $post_id, $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $post_id ) {
+ return $result;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = isset( $args['width'] ) ? $args['width'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post_id, $width );
</span></span></pre></div>
<a id="branches45testsphpunittestsoembedwpOembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/tests/phpunit/tests/oembed/wpOembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/tests/phpunit/tests/oembed/wpOembed.php 2016-06-16 17:29:35 UTC (rev 37731)
+++ branches/4.5/tests/phpunit/tests/oembed/wpOembed.php 2016-06-16 17:29:51 UTC (rev 37732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If this is not null, the oEmbed result has been filtered before any HTTP requests were made.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pre_oembed_result_filtered = $result;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Return false to prevent HTTP requests during tests.
+ return $result ? $result : false;
</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"> public function test_wp_filter_pre_oembed_result_prevents_http_request_for_internal_permalinks() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,4 +54,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false !== $this->pre_oembed_result_filtered );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function test_wp_filter_pre_oembed_result_non_existent_post() {
+ $post_id = self::factory()->post->create();
+ $permalink = get_permalink( $post_id );
+
+ $this->go_to( $permalink );
+ $this->assertQueryTrue( 'is_single', 'is_singular' );
+
+ add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+ $actual = $this->oembed->get_html( 'https://example.com/' );
+ remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+ $this->assertTrue( false !== $this->pre_oembed_result_filtered );
+ $this->assertFalse( $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>