From e0864925acbe70cd0b0e6e0053ebf7141682bcdf Mon Sep 17 00:00:00 2001 From: desrosj Date: Thu, 28 Jan 2021 18:57:00 +0000 Subject: [PATCH] Twenty Twenty-One: Revert [50043] from the 5.6 branch. Since a new version of Twenty Twenty-One will not be published in coordination with 5.6.1, this will prevent slight differences between the version of the theme that ships with 5.6.1 and the one users received when updating the theme to version `1.1`. See #52212. Built from https://develop.svn.wordpress.org/branches/5.6@50062 git-svn-id: http://core.svn.wordpress.org/branches/5.6@49763 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentytwentyone/inc/template-functions.php | 4 ---- wp-includes/blocks/embed/block.json | 4 +++- wp-includes/version.php | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/wp-content/themes/twentytwentyone/inc/template-functions.php b/wp-content/themes/twentytwentyone/inc/template-functions.php index 4e5fcd6abe..ec4efea558 100644 --- a/wp-content/themes/twentytwentyone/inc/template-functions.php +++ b/wp-content/themes/twentytwentyone/inc/template-functions.php @@ -417,10 +417,6 @@ add_filter( 'the_password_form', 'twenty_twenty_one_password_form' ); */ function twenty_twenty_one_get_attachment_image_attributes( $attr, $attachment, $size ) { - if ( is_admin() ) { - return $attr; - } - if ( isset( $attr['class'] ) && false !== strpos( $attr['class'], 'custom-logo' ) ) { return $attr; } diff --git a/wp-includes/blocks/embed/block.json b/wp-includes/blocks/embed/block.json index 3f6531af57..04de8cb589 100644 --- a/wp-includes/blocks/embed/block.json +++ b/wp-includes/blocks/embed/block.json @@ -34,5 +34,7 @@ "align": true, "reusable": false, "html": false - } + }, + "editorStyle": "wp-block-embed-editor", + "style": "wp-block-embed" } diff --git a/wp-includes/version.php b/wp-includes/version.php index bf0f4118c5..f256b6096c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6.1-alpha-50061'; +$wp_version = '5.6.1-alpha-50062'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.