From e51fb6767ddaf0a1da671329ba96d788814a04b6 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Mon, 26 Jul 2021 03:23:02 +0000 Subject: [PATCH] Bundled Themes: Use correct path for loading images in block patterns. By using `get_template_directory_uri()` instead of `get_stylesheet_directory_uri()`, we make sure to include the images from the parent theme. This avoids displaying missing images in block patterns when using a child theme of Twenty Ten, Twenty Eleven, or Twenty Twelve. Follow-up to [51033], [51103], [51106]. Props audrasjb, SergeyBiryukov. Merges [51483] to the 5.8 branch. Fixes #53769. git-svn-id: https://develop.svn.wordpress.org/branches/5.8@51488 602fd350-edb4-49c9-b593-d223f7449a82 --- .../themes/twentyeleven/inc/block-patterns.php | 4 ++-- src/wp-content/themes/twentyten/block-patterns.php | 4 ++-- .../themes/twentytwelve/inc/block-patterns.php | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wp-content/themes/twentyeleven/inc/block-patterns.php b/src/wp-content/themes/twentyeleven/inc/block-patterns.php index 203ff2cdea..21c13dfed7 100644 --- a/src/wp-content/themes/twentyeleven/inc/block-patterns.php +++ b/src/wp-content/themes/twentyeleven/inc/block-patterns.php @@ -39,7 +39,7 @@ if ( function_exists( 'register_block_pattern' ) ) {
-
' . esc_attr( 'A yellow flower against a dark background.', 'twentyeleven' ) . '
+
' . esc_attr( 'A yellow flower against a dark background.', 'twentyeleven' ) . '

' . esc_html__( 'This is just an example post to showcase the featured post section on the showcase page. Who doesn’t like flowers? I like flowers. Nullam hendrerit enim nunc. Vestibulum eget nulla magna! Fusce lobortis neque eu neque egestas tincidunt. Duis elementum consequat lorem, in eleifend justo mollis at. Nam quis adipiscing magna. Duis adipiscing est ac nibh feugiat rhoncus. Donec non lorem felis, eget commodo purus.', 'twentyeleven' ) . '

@@ -117,7 +117,7 @@ if ( function_exists( 'register_block_pattern' ) ) {
-
' . esc_attr( 'Photo of a woman.', 'twentyeleven' ) . '
+
' . esc_attr( 'Photo of a woman.', 'twentyeleven' ) . '
diff --git a/src/wp-content/themes/twentyten/block-patterns.php b/src/wp-content/themes/twentyten/block-patterns.php index 57460dab28..72da6673da 100644 --- a/src/wp-content/themes/twentyten/block-patterns.php +++ b/src/wp-content/themes/twentyten/block-patterns.php @@ -33,7 +33,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => esc_html__( 'Introduction', 'twentyten' ), 'categories' => array( 'twentyten' ), 'viewportWidth' => 700, - 'content' => '
' . esc_attr__( 'A red barn with a white roof in a field.', 'twentyten' ) . '
' . esc_html__( 'An old barn we passed on the drive', 'twentyten' ) . '

' . esc_html__( 'A Weekend Away', 'twentyten' ) . '

' . esc_html__( 'It’s amazing what a good weekend can do. After a tough couple weeks at work, I knew I needed to get away and be in nature. My partner and I decided to take a long weekend and stay in a cabin in the woods. We packed up after work on Friday and drove out into the country, passing through fields full of horses, old farms, and quaint little town squares. It was an idyllic drive. Eventually, we reached our destination and unpacked the car. We couldn’t wait to cook up a simple dinner and then relax by the fireplace.', 'twentyten' ) . '

', + 'content' => '
' . esc_attr__( 'A red barn with a white roof in a field.', 'twentyten' ) . '
' . esc_html__( 'An old barn we passed on the drive', 'twentyten' ) . '

' . esc_html__( 'A Weekend Away', 'twentyten' ) . '

' . esc_html__( 'It’s amazing what a good weekend can do. After a tough couple weeks at work, I knew I needed to get away and be in nature. My partner and I decided to take a long weekend and stay in a cabin in the woods. We packed up after work on Friday and drove out into the country, passing through fields full of horses, old farms, and quaint little town squares. It was an idyllic drive. Eventually, we reached our destination and unpacked the car. We couldn’t wait to cook up a simple dinner and then relax by the fireplace.', 'twentyten' ) . '

', ) ); @@ -55,7 +55,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'title' => esc_html__( 'Alternating Images', 'twentyten' ), 'categories' => array( 'twentyten' ), 'viewportWidth' => 700, - 'content' => '
' . esc_attr__( 'A lake with several boats docked. The sun is rising behind mountains in the background.', 'twentyten' ) . '
' . esc_html__( 'The lake at 6:54 AM', 'twentyten' ) . '

' . esc_html__( 'Nearby our cabin was a lake. The sunrise looked beautiful as it rose over the hills beyond the water, reflecting down onto the gentle morning waves. I sat on the dock and drank a cup of coffee, enjoying the cool air on my skin. The coffee kept me warm inside.', 'twentyten' ) . '

' . esc_html__( 'Later that night, we went back to the lake and sat by the shore. It felt different at night; quieter, as if all of nature had gone to sleep for a little while. The only noises were the chirp of crickets and the soft splash of the waves lapping at the shore. What a beautiful way to end the day.', 'twentyten' ) . '

' . esc_attr__( 'A lake at night, with Adirondack chairs in the foreground. The sun sets in the background.', 'twentyten' ) . '
' . esc_html__( 'Relaxing at the lake after dinner', 'twentyten' ) . '
', + 'content' => '
' . esc_attr__( 'A lake with several boats docked. The sun is rising behind mountains in the background.', 'twentyten' ) . '
' . esc_html__( 'The lake at 6:54 AM', 'twentyten' ) . '

' . esc_html__( 'Nearby our cabin was a lake. The sunrise looked beautiful as it rose over the hills beyond the water, reflecting down onto the gentle morning waves. I sat on the dock and drank a cup of coffee, enjoying the cool air on my skin. The coffee kept me warm inside.', 'twentyten' ) . '

' . esc_html__( 'Later that night, we went back to the lake and sat by the shore. It felt different at night; quieter, as if all of nature had gone to sleep for a little while. The only noises were the chirp of crickets and the soft splash of the waves lapping at the shore. What a beautiful way to end the day.', 'twentyten' ) . '

' . esc_attr__( 'A lake at night, with Adirondack chairs in the foreground. The sun sets in the background.', 'twentyten' ) . '
' . esc_html__( 'Relaxing at the lake after dinner', 'twentyten' ) . '
', ) ); } diff --git a/src/wp-content/themes/twentytwelve/inc/block-patterns.php b/src/wp-content/themes/twentytwelve/inc/block-patterns.php index 2c805446ab..653983fe66 100644 --- a/src/wp-content/themes/twentytwelve/inc/block-patterns.php +++ b/src/wp-content/themes/twentytwelve/inc/block-patterns.php @@ -40,18 +40,18 @@ if ( function_exists( 'register_block_pattern' ) ) { -
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
+
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
-
' . esc_attr__( 'Close up of a yellow leaf.', 'twentytwelve' ) . '
+
' . esc_attr__( 'Close up of a yellow leaf.', 'twentytwelve' ) . '
-
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
+
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
@@ -59,7 +59,7 @@ if ( function_exists( 'register_block_pattern' ) ) { -
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
+
' . esc_attr__( 'Close up of a yellow and green leaf.', 'twentytwelve' ) . '
@@ -92,7 +92,7 @@ if ( function_exists( 'register_block_pattern' ) ) { 'content' => '
-
' . esc_attr__( 'Close up of a yellow leaf.', 'twentytwelve' ) . '
+
' . esc_attr__( 'Close up of a yellow leaf.', 'twentytwelve' ) . '