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

FSE: Allow child theme.json to be merged with parent theme.json #35459

Merged
merged 9 commits into from Oct 18, 2021
Merged

FSE: Allow child theme.json to be merged with parent theme.json #35459

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9dc0390
FSE: Allow child theme.json to be merged with parent theme.json
scruffian Oct 8, 2021
e297f71
Update lib/class-wp-theme-json-resolver-gutenberg.php
scruffian Oct 8, 2021
5a19452
add a claifying comment
scruffian Oct 8, 2021
d7c53be
Update lib/class-wp-theme-json-resolver-gutenberg.php
scruffian Oct 8, 2021
88d6630
Update lib/class-wp-theme-json-resolver-gutenberg.php
scruffian Oct 8, 2021
6a6197e
Fix lint error
Mamaduka Oct 8, 2021
b347362
Merge branch 'trunk' into add/support-child-theme-json-merging
Mamaduka Oct 15, 2021
966463b
Add directory flag to get_file_path_from_theme method
Mamaduka Oct 15, 2021
e53fcb4
Add unit tests for merging
Mamaduka Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/class-wp-theme-json-resolver-gutenberg.php
View file
Open in desktop
Expand Up @@ -273,7 +273,19 @@ public static function get_theme_data( $theme_support_data = array() ) {
if ( null === self::$theme ) {
$theme_json_data = self::read_json_file( self::get_file_path_from_theme( 'theme.json' ) );
$theme_json_data = self::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
self::$theme = new WP_Theme_JSON_Gutenberg( $theme_json_data );
self::$theme = new WP_Theme_JSON_Gutenberg( $theme_json_data );

// If this is a child theme we want to combine the theme.json from the child with the theme.json with the parent.
scruffian marked this conversation as resolved.
Show resolved Hide resolved
if ( is_child_theme() ) {
scruffian marked this conversation as resolved.
Show resolved Hide resolved
// Get parent theme.json.
$parent_theme_json_data = self::read_json_file( get_template_directory() . '/theme.json' );
$parent_theme_json_data = self::translate( $parent_theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
$parent_theme_json_class_instance = new WP_Theme_JSON_Gutenberg( $parent_theme_json_data );
scruffian marked this conversation as resolved.
Show resolved Hide resolved

// Merge the child theme.json into the parent theme.json.
$parent_theme_json_class_instance->merge( self::$theme );
self::$theme = $parent_theme_json_class_instance;
}
}

if ( empty( $theme_support_data ) ) {
Expand Down