Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update is_fse_active to utilize FSE helper function #13449

Merged
merged 1 commit into from
Sep 9, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions sal/class.json-api-site-jetpack.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,27 +201,7 @@ function is_fse_active() {
if ( ! Jetpack::is_plugin_active( 'full-site-editing/full-site-editing-plugin.php' ) ) {
return false;
}
if (
/**
* Allow disabling Full Site Editing, even when the FSE plugin is active.
*
* @module json-api
*
* @since 7.7.0
*
* @param bool $disable_fse Disable Full Site Editing. Defaults to false.
*/
apply_filters( 'a8c_disable_full_site_editing', false )
) {
return false;
}
$has_is_supported_theme_method = method_exists( '\A8C\FSE\Full_Site_Editing', 'is_supported_theme' );
$has_normalize_theme_slug = method_exists( '\A8C\FSE\Full_Site_Editing', 'normalize_theme_slug' );
if ( $has_is_supported_theme_method && $has_normalize_theme_slug ) {
$slug = \A8C\FSE\Full_Site_Editing::get_instance()->normalize_theme_slug( get_option( 'stylesheet' ) );
return \A8C\FSE\Full_Site_Editing::get_instance()->is_supported_theme( $slug );
}
return false;
return function_exists( '\A8C\FSE\is_full_site_editing_active' ) && \A8C\FSE\is_full_site_editing_active();
}

/**
Expand Down