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.

Sign up for GitHub

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

Jump to bottom

Clean up Limit Global Styles logic #70121

Merged
merged 7 commits into from
Dec 6, 2022
Merged

Clean up Limit Global Styles logic #70121

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec75e26
Clean up Limit Global Styles logic
mmtr Nov 17, 2022
a8cf307
Fix fatal error
dsas Nov 17, 2022
87c0061
Do no trigger action, and add explanatory comment
mmtr Nov 18, 2022
3b0cf99
Use wp_get_theme param since it's more readable
mmtr Nov 18, 2022
7d162af
Merge remote-tracking branch 'origin/trunk' into update/clean-up-limi…
mmtr Dec 5, 2022
c9a83d7
Add early return
mmtr Dec 5, 2022
0d38e52
Merge remote-tracking branch 'origin/trunk' into update/clean-up-limi…
mmtr Dec 6, 2022
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
15 changes: 8 additions & 7 deletions apps/editing-toolkit/editing-toolkit-plugin/wpcom-global-styles/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,14 @@ function wpcom_block_global_styles_frontend( $theme_json ) {

if ( class_exists( 'WP_Theme_JSON_Data' ) ) {
return new WP_Theme_JSON_Data( array(), 'custom' );
} elseif ( class_exists( 'WP_Theme_JSON_Data_Gutenberg' ) ) {
return new WP_Theme_JSON_Data_Gutenberg( array(), 'custom' );
}

/*
* If both `WP_Theme_JSON_Data` and `WP_Theme_JSON_Data_Gutenberg` are missing,
* then the site is running an old version of WordPress and Gutenberg where we
* cannot block the user styles properly.
* If `WP_Theme_JSON_Data` is missing, then the site is running an old
* version of WordPress we cannot block the user styles properly.
*/
return $theme_json;
}
add_filter( 'theme_json_user', 'wpcom_block_global_styles_frontend' );
add_filter( 'wp_theme_json_data_user', 'wpcom_block_global_styles_frontend' );

/**
Expand Down Expand Up @@ -184,7 +180,12 @@ function wpcom_track_global_styles( $blog_id, $post, $updated ) {
* @return bool Returns true if custom styles are in use.
*/
function wpcom_global_styles_in_use() {
$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( wp_get_theme() );
if ( class_exists( 'WP_Theme_JSON_Resolver' ) ) {
mmtr marked this conversation as resolved.
Show resolved Hide resolved
$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( null );
} else {
do_action( 'global_styles_log', 'global_styles_not_in_use' );
mmtr marked this conversation as resolved.
Show resolved Hide resolved
return false;
}

if ( ! isset( $user_cpt['post_content'] ) ) {
do_action( 'global_styles_log', 'global_styles_not_in_use' );
Expand Down