Themes: Improve Gutenberg check before activating an FSE theme.

peterwilsoncc · peterwilsoncc · commit 098ab594feaf · 2021-06-22T05:55:52.000Z
Account for sites enabling Gutenberg as an mu-plugin when determining whether full-site-editing themes can be enabled. This replaces the check the plugin is active with a check whether the function `gutenberg_is_fse_theme()` is defined. Follow up to [51193]. Props noisysocks, peterwilsoncc, SergeyBiryukov. See #53410. git-svn-id: https://develop.svn.wordpress.org/trunk@51197 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
@@ -189,7 +189,7 @@
 			// Check if the theme requires the FSE to work correctly.
 			$theme_tags = $wp_customize->theme()->get( 'Tags' );
 
-			if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! is_plugin_active( 'gutenberg/gutenberg.php' ) ) {
+			if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! function_exists( 'gutenberg_is_fse_theme' ) ) {
 				$fse_safe = false;
 			}
 			?>
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
@@ -911,7 +911,7 @@ function validate_theme_requirements( $stylesheet ) {
 	// If the theme is a Full Site Editing theme, check for the presence of the Gutenberg plugin.
 	$theme_tags = $theme->get( 'Tags' );
 
-	if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! is_plugin_active( 'gutenberg/gutenberg.php' ) ) {
+	if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! function_exists( 'gutenberg_is_fse_theme' ) ) {
 		return new WP_Error(
 			'theme_requires_fse',
 			sprintf(

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@`
`189`	`189`	`// Check if the theme requires the FSE to work correctly.`
`190`	`190`	`$theme_tags = $wp_customize->theme()->get( 'Tags' );`
`191`	`191`
`192`		`- if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! is_plugin_active( 'gutenberg/gutenberg.php' ) ) {`
	`192`	`+ if ( ! empty( $theme_tags ) && in_array( 'full-site-editing', $theme_tags, true ) && ! function_exists( 'gutenberg_is_fse_theme' ) ) {`
`193`	`193`	`$fse_safe = false;`
`194`	`194`	`}`
`195`	`195`	`?>`