<!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>[49374] branches/5.5: Embeds: Disable embeds on deactivated Multisite 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 { white-space: pre-line; 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/49374">49374</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/49374","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-29 16:52:48 +0000 (Thu, 29 Oct 2020)</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: Disable embeds on deactivated Multisite sites.

Props xknown, whyisjake, zieladam, peterwilsoncc.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches55srcwpincludesembedphp">branches/5.5/src/wp-includes/embed.php</a></li>
<li><a href="#branches55testsphpunittestsmultisitesitephp">branches/5.5/tests/phpunit/tests/multisite/site.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches55srcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/wp-includes/embed.php    2020-10-29 16:36:19 UTC (rev 49373)
+++ branches/5.5/src/wp-includes/embed.php      2020-10-29 16:52:48 UTC (rev 49374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,6 +610,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $sites = get_sites( $qv );
</span><span class="cx" style="display: block; padding: 0 10px">                $site  = reset( $sites );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Do not allow embeds for deleted/archived/spam sites.
+               if ( ! empty( $site->deleted ) || ! empty( $site->spam ) || ! empty( $site->archived ) ) {
+                       return false;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $site && get_current_blog_id() !== (int) $site->blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        switch_to_blog( $site->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">                        $switched_blog = true;
</span></span></pre></div>
<a id="branches55testsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/tests/phpunit/tests/multisite/site.php       2020-10-29 16:36:19 UTC (rev 49373)
+++ branches/5.5/tests/phpunit/tests/multisite/site.php 2020-10-29 16:52:48 UTC (rev 49374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,6 +488,36 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
</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">+                function test_content_from_spam_blog_is_not_available() {
+                       $spam_blog_id = self::factory()->blog->create();
+                       switch_to_blog( $spam_blog_id );
+                       $post_data      = array(
+                               'post_title'   => 'Hello World!',
+                               'post_content' => 'Hello world content',
+                       );
+                       $post_id        = self::factory()->post->create( $post_data );
+                       $post           = get_post( $post_id );
+                       $spam_permalink = site_url() . '/?p=' . $post->ID;
+                       $spam_embed_url = get_post_embed_url( $post_id );
+
+                       restore_current_blog();
+                       $this->assertNotEmpty( $spam_permalink );
+                       $this->assertEquals( $post_data['post_title'], $post->post_title );
+
+                       update_blog_status( $spam_blog_id, 'spam', 1 );
+
+                       $post_id = self::factory()->post->create(
+                               array(
+                                       'post_content' => "\n $spam_permalink \n",
+                               )
+                       );
+                       $post    = get_post( $post_id );
+                       $content = apply_filters( 'the_content', $post->post_content );
+
+                       $this->assertNotContains( $post_data['post_title'], $content );
+                       $this->assertNotContains( "src=\"{$spam_embed_url}#?", $content );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 function test_update_blog_status_make_spam_blog_action() {
</span><span class="cx" style="display: block; padding: 0 10px">                        global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px">                        $test_action_counter = 0;
</span></span></pre>
</div>
</div>

</body>
</html>