Skip to content

Migrate theme.json based on origin #62305

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

Merged
oandregal merged 7 commits into from
Jun 5, 2024
Merged

Migrate theme.json based on origin #62305

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
818a849
Pass origin into migrate instead of relying on isGlobalStylesUserThem…
ajlende Jun 4, 2024
b14c869
Bring back changes from 61262
oandregal Jun 5, 2024
bb01521
Cover the other use of migrate
oandregal Jun 5, 2024
6374f85
Fix comment
oandregal Jun 5, 2024
1282916
Update comment
oandregal Jun 5, 2024
b50c7e2
Add backport file
oandregal Jun 5, 2024
c4f4ae6
Update since
oandregal Jun 5, 2024
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
Prev Previous commit
Next Next commit
Bring back changes from 61262
  • Loading branch information
@oandregal
oandregal committed Jun 5, 2024
commit b14c869151313ce6393b87f6e534eeed9698443e
6 changes: 2 additions & 4 deletions lib/class-wp-theme-json-resolver-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,8 @@ public static function get_user_data() {
}

/** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
$theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
$config = $theme_json->get_data();

static::$user = new WP_Theme_JSON_Gutenberg( $config, 'custom' );
$theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
static::$user = $theme_json->get_theme_json();

return static::$user;
}
Expand Down