<!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>[41600] trunk: Embeds: Improve performance when embedding a post on Multisite.</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/41600">41600</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/41600","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>2017-09-26 08:39:57 +0000 (Tue, 26 Sep 2017)</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: Improve performance when embedding a post on Multisite.
After <a href="https://core.trac.wordpress.org/changeset/37798">[37798]</a>, this fixes embeds coming from a different site in the network.
Props imath.
Fixes <a href="https://core.trac.wordpress.org/ticket/40673">#40673</a>. See <a href="https://core.trac.wordpress.org/ticket/36767">#36767</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunktestsphpunittestsoembedwpOembedphp">trunk/tests/phpunit/tests/oembed/wpOembed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesembedphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2017-09-26 08:32:21 UTC (rev 41599)
+++ trunk/src/wp-includes/embed.php 2017-09-26 08:39:57 UTC (rev 41600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,6 +1071,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Null if the URL does not belong to the current site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_filter_pre_oembed_result( $result, $url, $args ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
+ $url_parts = wp_parse_args( wp_parse_url( $url ), array(
+ 'host' => '',
+ 'path' => '/',
+ ) );
+
+ $qv = array( 'domain' => $url_parts['host'], 'path' => '/' );
+
+ // In case of subdirectory configs, set the path.
+ if ( ! is_subdomain_install() ) {
+ $path = explode( '/', ltrim( $url_parts['path'], '/' ) );
+ $path = reset( $path );
+
+ if ( $path ) {
+ $qv['path'] = get_network()->path . $path . '/';
+ }
+ }
+
+ $sites = get_sites( $qv );
+ $site = reset( $sites );
+
+ if ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
+ switch_to_blog( $site->blog_id );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = url_to_postid( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1085,6 +1111,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_oembed_response_data( $post_id, $width );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = _wp_oembed_get_object()->data2html( (object) $data, $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 ( is_multisite() && ms_is_switched() ) {
+ restore_current_blog();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedwpOembedphp"></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/wpOembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/wpOembed.php 2017-09-26 08:32:21 UTC (rev 41599)
+++ trunk/tests/phpunit/tests/oembed/wpOembed.php 2017-09-26 08:39:57 UTC (rev 41600)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,4 +69,106 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( $this->pre_oembed_result_filtered );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $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">+
+ /**
+ * @ticket 40673
+ * @group multisite
+ * @group ms-required
+ */
+ public function test_wp_filter_pre_oembed_result_multisite_root_root() {
+ $post_id = self::factory()->post->create();
+ $permalink = get_permalink( $post_id );
+
+ add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+ $actual = $this->oembed->get_html( $permalink );
+ remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+ $this->assertNotNull( $this->pre_oembed_result_filtered );
+ $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+ }
+
+ /**
+ * @ticket 40673
+ * @group multisite
+ * @group ms-required
+ */
+ public function test_wp_filter_pre_oembed_result_multisite_sub_samesub() {
+ $user_id = self::factory()->user->create();
+
+ $blog_id = self::factory()->blog->create( array(
+ 'user_id' => $user_id,
+ ) );
+
+ switch_to_blog( $blog_id );
+
+ $post_id = self::factory()->post->create();
+ $permalink = get_permalink( $post_id );
+
+ add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+ $actual = $this->oembed->get_html( $permalink );
+ remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+ restore_current_blog();
+
+ $this->assertNotNull( $this->pre_oembed_result_filtered );
+ $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+ }
+
+ /**
+ * @ticket 40673
+ * @group multisite
+ * @group ms-required
+ */
+ public function test_wp_filter_pre_oembed_result_multisite_sub_othersub() {
+ $user_id = self::factory()->user->create();
+
+ $blog_id = self::factory()->blog->create( array(
+ 'user_id' => $user_id,
+ ) );
+
+ switch_to_blog( $blog_id );
+
+ $post_id = self::factory()->post->create();
+ $permalink = get_permalink( $post_id );
+
+ $blog_id = self::factory()->blog->create( array(
+ 'user_id' => $user_id,
+ ) );
+
+ switch_to_blog( $blog_id );
+
+ add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+ $actual = $this->oembed->get_html( $permalink );
+ remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+ restore_current_blog();
+
+ $this->assertNotNull( $this->pre_oembed_result_filtered );
+ $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+ }
+
+ /**
+ * @ticket 40673
+ * @group multisite
+ * @group ms-required
+ */
+ public function test_wp_filter_pre_oembed_result_multisite_sub_main() {
+ $post_id = self::factory()->post->create();
+ $permalink = get_permalink( $post_id );
+ $user_id = self::factory()->user->create();
+ $blog_id = self::factory()->blog->create( array(
+ 'user_id' => $user_id,
+ ) );
+
+ switch_to_blog( $blog_id );
+
+ add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+ $actual = $this->oembed->get_html( $permalink );
+ remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+ restore_current_blog();
+
+ $this->assertNotNull( $this->pre_oembed_result_filtered );
+ $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>