Commit 3c5699206b for wordpress.org
commit 3c5699206b145edb2331f7b38aa1361222d10767
Author: Peter Wilson <wilson@peterwilson.cc>
Date: Thu Oct 17 00:37:17 2024 +0000
Bundled Themes: Avoid loading translations too early.
Load block patterns for bundled themes on the `init` hook to avoid triggering notices caused by loading the translations too early.
The change is applied to Twenty Ten, Twenty Twelve, Twenty Thirteen, Twenty Fourteen, Twenty Fifteen, Twenty Sixteen and Twenty Twenty.
Props domainsupport, swissspidy.
Fixes #62237.
See #44937.
Built from https://develop.svn.wordpress.org/trunk@59244
git-svn-id: http://core.svn.wordpress.org/trunk@58636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index 38623e4124..401efd310e 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -657,8 +657,12 @@ require get_template_directory() . '/inc/template-tags.php';
require get_template_directory() . '/inc/customizer.php';
/**
- * Block Patterns.
+ * Register block patterns and pattern categories.
*
- * @since Twenty Fifteen 3.0
+ * @since Twenty Fifteen 3.9
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentyfifteen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentyfifteen_register_block_patterns' );
diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
index 73cfed09da..100c4adffe 100644
--- a/wp-content/themes/twentyfourteen/functions.php
+++ b/wp-content/themes/twentyfourteen/functions.php
@@ -728,8 +728,16 @@ require get_template_directory() . '/inc/template-tags.php';
// Add Customizer functionality.
require get_template_directory() . '/inc/customizer.php';
-// Add support for block patterns.
-require get_template_directory() . '/inc/block-patterns.php';
+/**
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Fourteen 4.1
+ */
+function twentyfourteen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentyfourteen_register_block_patterns' );
/*
* Add Featured Content functionality.
diff --git a/wp-content/themes/twentynineteen/functions.php b/wp-content/themes/twentynineteen/functions.php
index de93b40f77..41a798bfbf 100644
--- a/wp-content/themes/twentynineteen/functions.php
+++ b/wp-content/themes/twentynineteen/functions.php
@@ -384,6 +384,12 @@ require get_template_directory() . '/inc/template-tags.php';
require get_template_directory() . '/inc/customizer.php';
/**
- * Block Patterns.
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Nineteen 3.0
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentynineteen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentynineteen_register_block_patterns' );
diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
index cc75653b84..05bd5c0957 100644
--- a/wp-content/themes/twentyseventeen/functions.php
+++ b/wp-content/themes/twentyseventeen/functions.php
@@ -737,6 +737,12 @@ require get_parent_theme_file_path( '/inc/customizer.php' );
require get_parent_theme_file_path( '/inc/icon-functions.php' );
/**
- * Block Patterns.
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Seventeen 3.8
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentyseventeen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentyseventeen_register_block_patterns' );
diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
index 6fb375198c..eb90dc5cc1 100644
--- a/wp-content/themes/twentysixteen/functions.php
+++ b/wp-content/themes/twentysixteen/functions.php
@@ -528,10 +528,17 @@ function twentysixteen_hex2rgb( $color ) {
*/
require get_template_directory() . '/inc/template-tags.php';
+
/**
- * Block Patterns.
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Sixteen 3.4
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentysixteen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentysixteen_register_block_patterns' );
/**
* Customizer additions.
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 4fed4b0735..97a2043d9c 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -781,8 +781,16 @@ function twentyten_block_editor_styles() {
}
add_action( 'enqueue_block_editor_assets', 'twentyten_block_editor_styles' );
-// Block Patterns.
-require get_template_directory() . '/block-patterns.php';
+/**
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Ten 4.3
+ */
+function twentyten_register_block_patterns() {
+ require get_template_directory() . '/block-patterns.php';
+}
+
+add_action( 'init', 'twentyten_register_block_patterns' );
if ( ! function_exists( 'wp_body_open' ) ) :
/**
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index 8f25d7681d..46166c99ce 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -46,11 +46,15 @@ if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) {
}
/**
- * Block Patterns.
+ * Register block patterns and pattern categories.
*
- * @since Twenty Thirteen 3.4
+ * @since Twenty Thirteen 4.3
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentythirteen_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentythirteen_register_block_patterns' );
/**
* Twenty Thirteen setup.
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index a073abed1b..d29080189b 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -140,9 +140,15 @@ add_action( 'after_setup_theme', 'twentytwelve_setup' );
require get_template_directory() . '/inc/custom-header.php';
/**
- * Add block patterns.
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Twelve 4.4
*/
-require get_template_directory() . '/inc/block-patterns.php';
+function twentytwelve_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentytwelve_register_block_patterns' );
if ( ! function_exists( 'twentytwelve_get_font_url' ) ) :
/**
diff --git a/wp-content/themes/twentytwenty/functions.php b/wp-content/themes/twentytwenty/functions.php
index 515cdb1314..96945243fa 100644
--- a/wp-content/themes/twentytwenty/functions.php
+++ b/wp-content/themes/twentytwenty/functions.php
@@ -175,8 +175,16 @@ require get_template_directory() . '/classes/class-twentytwenty-non-latin-langua
// Custom CSS.
require get_template_directory() . '/inc/custom-css.php';
-// Block Patterns.
-require get_template_directory() . '/inc/block-patterns.php';
+/**
+ * Register block patterns and pattern categories.
+ *
+ * @since Twenty Twenty 2.8
+ */
+function twentytwenty_register_block_patterns() {
+ require get_template_directory() . '/inc/block-patterns.php';
+}
+
+add_action( 'init', 'twentytwenty_register_block_patterns' );
/**
* Register and Enqueue Styles.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 01a2d17144..96ffdb7857 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.7-beta3-59243';
+$wp_version = '6.7-beta3-59244';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.