From 88cedeac5c00bf449acbaff2d4c67abe7356d4fd Mon Sep 17 00:00:00 2001 From: desrosj Date: Wed, 14 Jul 2021 20:02:59 +0000 Subject: [PATCH] Bundled Themes: Revert the [51372] update to block patterns in bundled themes. Upon further examination, this change was not great for backwards compatibility, resulting in block validation errors when running on older versions of WordPress. While there are currently many `console.info()` notices caused by older format block syntax being updated to the current version included in WordPress 5.8, the blocks do not break. Block patterns do not currently have a versioning mechanism, or a means to indicate which versions of WordPress are supported. See #53617. Built from https://develop.svn.wordpress.org/trunk@51434 git-svn-id: http://core.svn.wordpress.org/trunk@51045 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../twentyeleven/inc/block-patterns.php | 2 +- .../twentyfifteen/inc/block-patterns.php | 2 +- .../twentyfourteen/inc/block-patterns.php | 4 +-- .../twentyseventeen/inc/block-patterns.php | 34 +++++++++---------- .../twentysixteen/inc/block-patterns.php | 6 ++-- .../twentytwelve/inc/block-patterns.php | 4 +-- .../twentytwenty/inc/block-patterns.php | 20 +++++------ .../twentytwentyone/inc/block-patterns.php | 10 +++--- wp-includes/version.php | 2 +- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/wp-content/themes/twentyeleven/inc/block-patterns.php b/wp-content/themes/twentyeleven/inc/block-patterns.php index 542224b3ee..203ff2cdea 100644 --- a/wp-content/themes/twentyeleven/inc/block-patterns.php +++ b/wp-content/themes/twentyeleven/inc/block-patterns.php @@ -97,7 +97,7 @@ if ( function_exists( 'register_block_pattern' ) ) {

' . esc_html__( 'Join 1,729 other followers', 'twentyeleven' ) . '

-
+
diff --git a/wp-content/themes/twentyfifteen/inc/block-patterns.php b/wp-content/themes/twentyfifteen/inc/block-patterns.php index 085b5eae8a..0e220d3ebe 100644 --- a/wp-content/themes/twentyfifteen/inc/block-patterns.php +++ b/wp-content/themes/twentyfifteen/inc/block-patterns.php @@ -42,7 +42,7 @@ if ( function_exists( 'register_block_pattern' ) ) { array( 'title' => esc_html__( 'Contact area', 'twentyfifteen' ), 'categories' => array( 'twentyfifteen' ), - 'content' => '

' . esc_html__( 'Email', 'twentyfifteen' ) . '
' . esc_html__( 'example@example.com', 'twentyfifteen' ) . '

' . esc_html__( 'Follow us', 'twentyfifteen' ) . '

' . esc_html__( 'Phone', 'twentyfifteen' ) . '
' . esc_html__( '(123) 555-5555', 'twentyfifteen' ) . '

' . esc_html__( 'Address', 'twentyfifteen' ) . '
' . esc_html__( '123 Main Street', 'twentyfifteen' ) . '
' . esc_html__( 'City, State, 00000', 'twentyfifteen' ) . '

', + 'content' => '

' . esc_html__( 'Email', 'twentyfifteen' ) . '
' . esc_html__( 'example@example.com', 'twentyfifteen' ) . '

' . esc_html__( 'Follow us', 'twentyfifteen' ) . '

' . esc_html__( 'Phone', 'twentyfifteen' ) . '
' . esc_html__( '(123) 555-5555', 'twentyfifteen' ) . '

' . esc_html__( 'Address', 'twentyfifteen' ) . '
' . esc_html__( '123 Main Street', 'twentyfifteen' ) . '
' . esc_html__( 'City, State, 00000', 'twentyfifteen' ) . '

', ) ); diff --git a/wp-content/themes/twentyfourteen/inc/block-patterns.php b/wp-content/themes/twentyfourteen/inc/block-patterns.php index 914955a6cf..5d653007e5 100644 --- a/wp-content/themes/twentyfourteen/inc/block-patterns.php +++ b/wp-content/themes/twentyfourteen/inc/block-patterns.php @@ -55,7 +55,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => esc_html__( 'Summary', 'twentyfourteen' ), 'categories' => array( 'twentyfourteen' ), 'viewportWidth' => 1000, - 'content' => '

' . esc_html__( 'Traveling Nostalgia', 'twentyfourteen' ) . '

' . esc_html__( 'Here are some photos from my all-time favorite destinations.', 'twentyfourteen' ) . '

' . esc_html__( 'Photo of a sunset', 'twentyfourteen' ) . '
' . esc_html__( 'Sunset', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a bridge', 'twentyfourteen' ) . '
' . esc_html__( 'Bridge', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a streetscape', 'twentyfourteen' ) . '
' . esc_html__( 'Streetscape', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a cloudy mountain', 'twentyfourteen' ) . '
' . esc_html__( 'Clouds', 'twentyfourteen' ) . '
', + 'content' => '

' . esc_html__( 'Traveling Nostalgia', 'twentyfourteen' ) . '

' . esc_html__( 'Here are some photos from my all-time favorite destinations.', 'twentyfourteen' ) . '

' . esc_html__( 'Photo of a sunset', 'twentyfourteen' ) . '
' . esc_html__( 'Sunset', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a bridge', 'twentyfourteen' ) . '
' . esc_html__( 'Bridge', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a streetscape', 'twentyfourteen' ) . '
' . esc_html__( 'Streetscape', 'twentyfourteen' ) . '
' . esc_attr__( 'Photo of a cloudy mountain', 'twentyfourteen' ) . '
' . esc_html__( 'Clouds', 'twentyfourteen' ) . '
', ) ); @@ -66,7 +66,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => esc_html__( 'Contact', 'twentyfourteen' ), 'categories' => array( 'twentyfourteen' ), 'viewportWidth' => 1000, - 'content' => '

' . esc_html__( 'GOT A QUESTION?', 'twentyfourteen' ) . '

' . esc_html__( 'Don’t hesitate to reach out.', 'twentyfourteen' ) . '

', + 'content' => '

' . esc_html__( 'GOT A QUESTION?', 'twentyfourteen' ) . '

' . esc_html__( 'Don’t hesitate to reach out.', 'twentyfourteen' ) . '

', ) ); diff --git a/wp-content/themes/twentyseventeen/inc/block-patterns.php b/wp-content/themes/twentyseventeen/inc/block-patterns.php index df8bb5fadc..cc8c1aad4f 100644 --- a/wp-content/themes/twentyseventeen/inc/block-patterns.php +++ b/wp-content/themes/twentyseventeen/inc/block-patterns.php @@ -32,7 +32,7 @@ if ( function_exists( 'register_block_pattern' ) ) { -
+ ', @@ -95,7 +95,7 @@ if ( function_exists( 'register_block_pattern' ) ) {
-
+
' . __( 'Black Stripes', 'twentyseventeen' ) . '
@@ -104,12 +104,12 @@ if ( function_exists( 'register_block_pattern' ) ) {

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

-
+
-
+
' . __( 'White border', 'twentyseventeen' ) . '
@@ -118,12 +118,12 @@ if ( function_exists( 'register_block_pattern' ) ) {

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

-
+
-
+
' . __( 'Direct Light', 'twentyseventeen' ) . '
@@ -132,7 +132,7 @@ if ( function_exists( 'register_block_pattern' ) ) {

' . __( 'See Case Study' ) . ' →

-
+
@@ -150,28 +150,28 @@ if ( function_exists( 'register_block_pattern' ) ) { 'content' => ' - +

' . __( 'Our Services', 'twentyseventeen' ) . '

- + - + ', @@ -187,9 +187,9 @@ if ( function_exists( 'register_block_pattern' ) ) {

' . __( 'We are proud to serve outstanding clients.', 'twentyseventeen' ) . '

- + -
diff --git a/wp-content/themes/twentysixteen/inc/block-patterns.php b/wp-content/themes/twentysixteen/inc/block-patterns.php index 695b7efe10..69a80b2c4e 100644 --- a/wp-content/themes/twentysixteen/inc/block-patterns.php +++ b/wp-content/themes/twentysixteen/inc/block-patterns.php @@ -28,7 +28,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => __( 'Large heading with short description', 'twentysixteen' ), 'categories' => array( 'twentysixteen' ), 'content' => ' -
+
@@ -39,7 +39,7 @@ if ( function_exists( 'register_block_pattern' ) ) { -
+
', ) ); @@ -136,7 +136,7 @@ if ( function_exists( 'register_block_pattern' ) ) {
- diff --git a/wp-content/themes/twentytwelve/inc/block-patterns.php b/wp-content/themes/twentytwelve/inc/block-patterns.php index 2e970cca65..2c805446ab 100644 --- a/wp-content/themes/twentytwelve/inc/block-patterns.php +++ b/wp-content/themes/twentytwelve/inc/block-patterns.php @@ -34,7 +34,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'categories' => array( 'twentytwelve' ), 'viewportWidth' => 700, 'content' => ' -
+
@@ -62,7 +62,7 @@ if ( function_exists( 'register_block_pattern' ) ) {
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
-
+
', ) ); diff --git a/wp-content/themes/twentytwenty/inc/block-patterns.php b/wp-content/themes/twentytwenty/inc/block-patterns.php index 171c63000f..7fbf339a04 100644 --- a/wp-content/themes/twentytwenty/inc/block-patterns.php +++ b/wp-content/themes/twentytwenty/inc/block-patterns.php @@ -37,8 +37,8 @@ if ( function_exists( 'register_block_pattern' ) ) { '', array( '', - '
', - '
', + '
', + '
', '

' . esc_html__( 'Support the Museum and Get Exclusive Offers', 'twentytwenty' ) . '

', '', '', @@ -46,8 +46,8 @@ if ( function_exists( 'register_block_pattern' ) ) { '', '', '', - '
', - '
', + '
', + '
', '', ) ), @@ -67,7 +67,7 @@ if ( function_exists( 'register_block_pattern' ) ) { '', '
', '
', - '
', + '
', '

' . esc_html__( 'The Museum', 'twentytwenty' ) . '

', '', '', @@ -77,12 +77,12 @@ if ( function_exists( 'register_block_pattern' ) ) { '', - '
', + '
', '
', '', '', '
', - '
', + '
', '

' . esc_html__( 'The Store', 'twentytwenty' ) . '

', '', '', @@ -92,7 +92,7 @@ if ( function_exists( 'register_block_pattern' ) ) { '', - '
', + '
', '
', '
', '', @@ -112,7 +112,7 @@ if ( function_exists( 'register_block_pattern' ) ) { '', array( '', - '
', + '
', '
', '
', '

' . wp_kses_post( __( 'Dates
Aug 1 — Dec 1', 'twentytwenty' ) ) . '

', @@ -128,7 +128,7 @@ if ( function_exists( 'register_block_pattern' ) ) { '

' . wp_kses_post( __( 'Price
Included', 'twentytwenty' ) ) . '

', '
', '
', - '
', + '
', '', ) ), diff --git a/wp-content/themes/twentytwentyone/inc/block-patterns.php b/wp-content/themes/twentytwentyone/inc/block-patterns.php index 43c7494b57..bc89e86661 100644 --- a/wp-content/themes/twentytwentyone/inc/block-patterns.php +++ b/wp-content/themes/twentytwentyone/inc/block-patterns.php @@ -45,7 +45,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'categories' => array( 'twentytwentyone' ), 'viewportWidth' => 1440, 'description' => esc_html_x( 'A huge text followed by social networks and email address links.', 'Block pattern description', 'twentytwentyone' ), - 'content' => '', + 'content' => '

', ) ); @@ -57,7 +57,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'categories' => array( 'twentytwentyone' ), 'viewportWidth' => 1440, 'description' => esc_html_x( 'A Media & Text block with a big image on the left and a heading on the right. The heading is followed by a separator and a description paragraph.', 'Block pattern description', 'twentytwentyone' ), - 'content' => '
' . esc_attr__( '“Playing in the Sand” by Berthe Morisot', 'twentytwentyone' ) . '

' . esc_html__( 'Playing in the Sand', 'twentytwentyone' ) . '


' . wp_kses_post( __( 'Berthe Morisot
(French, 1841-1895)', 'twentytwentyone' ) ) . '

', + 'content' => '
' . esc_attr__( '“Playing in the Sand” by Berthe Morisot', 'twentytwentyone' ) . '

' . esc_html__( 'Playing in the Sand', 'twentytwentyone' ) . '


' . wp_kses_post( __( 'Berthe Morisot
(French, 1841-1895)', 'twentytwentyone' ) ) . '

', ) ); @@ -81,7 +81,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'categories' => array( 'twentytwentyone' ), 'viewportWidth' => 1440, 'description' => esc_html_x( 'A media & text block with a big image on the left and a smaller one with bordered frame on the right.', 'Block pattern description', 'twentytwentyone' ), - 'content' => '
' . esc_attr__( '“Daffodils” by Berthe Morisot', 'twentytwentyone' ) . '
' . esc_attr__( '“Self portrait” by Berthe Morisot', 'twentytwentyone' ) . '
', + 'content' => '
' . esc_attr__( '“Daffodils” by Berthe Morisot', 'twentytwentyone' ) . '
' . esc_attr__( '“Self portrait” by Berthe Morisot', 'twentytwentyone' ) . '
', ) ); @@ -93,7 +93,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'categories' => array( 'twentytwentyone' ), 'viewportWidth' => 1440, 'description' => esc_html_x( 'An overlapping columns block with two images and a text description.', 'Block pattern description', 'twentytwentyone' ), - 'content' => '
' . esc_attr__( '“The Garden at Bougival” by Berthe Morisot', 'twentytwentyone' ) . '

' . esc_html__( 'Beautiful gardens painted by Berthe Morisot in the late 1800s', 'twentytwentyone' ) . '

' . esc_attr__( '“Villa with Orange Trees, Nice” by Berthe Morisot', 'twentytwentyone' ) . '
', + 'content' => '
' . esc_attr__( '“The Garden at Bougival” by Berthe Morisot', 'twentytwentyone' ) . '

' . esc_html__( 'Beautiful gardens painted by Berthe Morisot in the late 1800s', 'twentytwentyone' ) . '

' . esc_attr__( '“Villa with Orange Trees, Nice” by Berthe Morisot', 'twentytwentyone' ) . '
', ) ); @@ -104,7 +104,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => esc_html__( 'Portfolio list', 'twentytwentyone' ), 'categories' => array( 'twentytwentyone' ), 'description' => esc_html_x( 'A list of projects with thumbnail images.', 'Block pattern description', 'twentytwentyone' ), - 'content' => '






', + 'content' => '






', ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 32bee113b3..edc30ac602 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-51432'; +$wp_version = '5.9-alpha-51434'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.