beenull/themes-wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Customizer Font Editing causing Site Editor WSOD (#5262)

Browse source 
* Clear fontFamilies data to ensure what is posted is always correct.  Refactored unset_property_if_it_exists() as it wasn't removing the fontFamilies Array as expected

* Change the way we fetch users CPT to use the Gutenberg function directly

Co-authored-by: Ben Dwyer <ben@scruffian.com>
This commit is contained in:
Jason Crist 2022-01-07 04:27:37 -05:00 committed by GitHub
parent ef2172d82c
commit 9e7036e6c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
blockbase/inc/customizer/wp-customize-fonts.php
View file

@ -459,9 +459,9 @@ class GlobalStylesFontsCustomizer {
}
}
function unset_property_if_it_exists( $property ) {
if ( isset( $property ) ) {
unset( $property );
function unset_property_if_it_exists( $object, $property ) {
if ( isset( $object[ $property ] ) ) {
unset( $object[ $property ] );
}
}
@ -504,19 +504,12 @@ class GlobalStylesFontsCustomizer {
$body_font_family_variable = 'var(--wp--preset--font-family--' . $body_setting['slug'] . ')';
$heading_font_family_variable = 'var(--wp--preset--font-family--' . $heading_setting['slug'] . ')';
// Get the user's theme.json from the CPT.
if ( method_exists( 'WP_Theme_JSON_Resolver_Gutenberg', 'get_user_global_styles_post_id' ) ) { // This is the new name.
$user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
} else if ( method_exists( 'WP_Theme_JSON_Resolver_Gutenberg', 'get_user_custom_post_type_id' ) ) { // This is the old name.
$user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_custom_post_type_id();
}
// Get the user's theme.json.
$user_theme_json_post_content = WP_Theme_JSON_Resolver_Gutenberg::get_user_data()->get_raw_data();
$user_theme_json_post = get_post( $user_custom_post_type_id );
$user_theme_json_post_content = json_decode( $user_theme_json_post->post_content );
$user_theme_json_post_content['isGlobalStylesUserThemeJSON'] = true;
// Set meta settings.
$user_theme_json_post_content->version = 1;
$user_theme_json_post_content->isGlobalStylesUserThemeJSON = true;
$this->unset_property_if_it_exists( $user_theme_json_post_content['settings']['typography'], 'fontFamilies' );
// Set the typography settings.
$user_theme_json_post_content = set_settings_array(
@ -527,21 +520,27 @@ class GlobalStylesFontsCustomizer {
//If the typeface choices === the default then we remove it instead
if ( $body_value === $body_default && $heading_value === $heading_default ) {
$this->unset_property_if_it_exists( $user_theme_json_post_content->settings->typography->fontFamilies );
// These lines need to stay for backwards compatibility.
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h1->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h2->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h3->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h4->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h5->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->elements->h6->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->blocks->{'core/button'}->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->blocks->{'core/post-title'}->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content->styles->blocks->{'core/pullquote'}->typography->fontFamily );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h1']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h2']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h3']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h4']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h5']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['elements']['h6']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['blocks']['core/button']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['blocks']['core/post-title']['typography'], 'fontFamily' );
$this->unset_property_if_it_exists( $user_theme_json_post_content['styles']['blocks']['core/pullquote']['typography'], 'fontFamily' );
}
// Get the user's theme.json from the CPT.
if ( method_exists( 'WP_Theme_JSON_Resolver_Gutenberg', 'get_user_global_styles_post_id' ) ) { // This is the new name.
$user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
} else if ( method_exists( 'WP_Theme_JSON_Resolver_Gutenberg', 'get_user_custom_post_type_id' ) ) { // This is the old name.
$user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_custom_post_type_id();
}
$user_theme_json_post = get_post( $user_custom_post_type_id );
// Update the theme.json with the new settings.
$user_theme_json_post->post_content = json_encode( $user_theme_json_post_content );
wp_update_post( $user_theme_json_post );

11
blockbase/inc/customizer/wp-customize-utils.php
View file

@ -14,17 +14,14 @@ function set_settings_array( $target, $array, $value ) {
$key = array_shift( $array );
$current =& $target;
while ( 0 < sizeof( $array ) ) {
if ( ! property_exists( $current, $key ) ) {
$current->{ $key } = (object) array();
if ( ! array_key_exists( $current, $key ) ) {
$current[ $key ] = array();
}
$current =& $current->{ $key };
// Cast to an object in the case where it's been set as an array.
$current = (object) $current;
$current =& $current[ $key ];
$key = array_shift( $array );
}
$current->{ $key } = $value;
$current[ $key ] = $value;
return $target;
}