Changeset 51197

Timestamp:

06/22/2021 05:55:52 AM (3 years ago)

Author:

peterwilsoncc

Message:

Themes: Improve Gutenberg check before activating an FSE theme.

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.

Location:

trunk/src

Files:

• wp-admin/customize.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-admin/customize.php

@@ -190 +190 @@
             $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;
             }

trunk/src/wp-includes/theme.php

@@ -912 +912 @@
     $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',