Inline theme_supports_block_templates

WordPress · May 25, 2021 · e4ecc6b · e4ecc6b
1 parent 71d29fc
commit e4ecc6b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
@@ -212,7 +212,7 @@
 	'supportsLayout'                       => WP_Theme_JSON_Resolver::theme_has_support(),
 	'__experimentalBlockPatterns'          => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
 	'__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
-	'supportsTemplateMode'                 => theme_supports_block_templates(),
+	'supportsTemplateMode'                 => current_theme_supports( 'block-templates' ),
 
 	// Whether or not to load the 'postcustom' meta box is stored as a user meta
 	// field so that we're not always loading its assets.

diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
@@ -1220,7 +1220,7 @@ public function get_post_templates() {
 				}
 			}
 
-			if ( theme_supports_block_templates() ) {
+			if ( current_theme_supports( 'block-templates' ) ) {
 				$block_templates = get_block_templates( array(), 'wp_template' );
 				foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
 					foreach ( $block_templates as $block_template ) {

diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
@@ -310,7 +310,7 @@ function create_initial_post_types() {
 		)
 	);
 
-	if ( theme_supports_block_templates() ) {
+	if ( current_theme_supports( 'block-templates' ) ) {
 		register_post_type(
 			'wp_template',
 			array(

diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
@@ -173,7 +173,7 @@ function create_initial_taxonomies() {
 		)
 	);
 
-	if ( theme_supports_block_templates() ) {
+	if ( current_theme_supports( 'block-templates' ) ) {
 		register_taxonomy(
 			'wp_theme',
 			array( 'wp_template' ),

diff --git a/src/wp-includes/theme-templates.php b/src/wp-includes/theme-templates.php
@@ -77,7 +77,7 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID
 function the_block_template_skip_link() {
 
 	// Early exit if not an FSE theme.
-	if ( ! theme_supports_block_templates() ) {
+	if ( ! current_theme_supports( 'block-templates' ) ) {
 		return;
 	}
 	?>

diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
@@ -3232,15 +3232,6 @@ function get_registered_theme_feature( $feature ) {
 	return isset( $_wp_registered_theme_features[ $feature ] ) ? $_wp_registered_theme_features[ $feature ] : null;
 }
 
-/**
- * Returns whether the current theme supports block templates
- *
- * @return boolean Whether the current theme supports block templates.
- */
-function theme_supports_block_templates() {
-	return current_theme_supports( 'block-templates' );
-}
-
 /**
  * Checks an attachment being deleted to see if it's a header or background image.
  *