sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Embeds: Disable embeds on deactivated Multisite sites.

Browse Source 
Props xknown, whyisjake, zieladam, peterwilsoncc.
Merges [49374] to trunk.

git-svn-id: https://develop.svn.wordpress.org/trunk@49383 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonathan Desrosiers 2020-10-29 17:59:40 +00:00
parent add6bedf3a
commit 4cbb155815
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/embed.php
View File

@ -610,6 +610,11 @@ function get_oembed_response_data_for_url( $url, $args ) {
$sites = get_sites( $qv ); $sites = get_sites( $qv );
$site = reset( $sites ); $site = reset( $sites );
// Do not allow embeds for deleted/archived/spam sites.
if ( ! empty( $site->deleted ) || ! empty( $site->spam ) || ! empty( $site->archived ) ) {
return false;
}
if ( $site && get_current_blog_id() !== (int) $site->blog_id ) { if ( $site && get_current_blog_id() !== (int) $site->blog_id ) {
switch_to_blog( $site->blog_id ); switch_to_blog( $site->blog_id );
$switched_blog = true; $switched_blog = true;

30
tests/phpunit/tests/multisite/site.php
View File

@ -488,6 +488,36 @@ if ( is_multisite() ) :
remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 ); remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
} }
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 );
}
function test_update_blog_status_make_spam_blog_action() { function test_update_blog_status_make_spam_blog_action() {
global $test_action_counter; global $test_action_counter;
$test_action_counter = 0; $test_action_counter = 0;