From 025f5a62a2fe8ff88a412926adee5122cc95dae8 Mon Sep 17 00:00:00 2001 From: desrosj Date: Thu, 29 Oct 2020 18:02:05 +0000 Subject: [PATCH] Embeds: Disable embeds on deactivated Multisite sites. Props xknown, whyisjake, zieladam, peterwilsoncc. Merges [49374] to trunk. Built from https://develop.svn.wordpress.org/trunk@49383 git-svn-id: http://core.svn.wordpress.org/trunk@49142 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/embed.php | 5 +++++ wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wp-includes/embed.php b/wp-includes/embed.php index 34db507584..0647a17794 100644 --- a/wp-includes/embed.php +++ b/wp-includes/embed.php @@ -611,6 +611,11 @@ function get_oembed_response_data_for_url( $url, $args ) { $sites = get_sites( $qv ); $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 ) { switch_to_blog( $site->blog_id ); $switched_blog = true; diff --git a/wp-includes/version.php b/wp-includes/version.php index 5ddc6df5ef..28a8ce495e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-beta2-49382'; +$wp_version = '5.6-beta2-49383'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.