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
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
Update comment
  • Loading branch information
@oandregal
oandregal committed Jun 5, 2024
commit 12829161b3161f56e4f9c2e235f03b40f45e9f6e
7 changes: 3 additions & 4 deletions lib/class-wp-theme-json-schema-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,9 @@ private static function migrate_v1_to_v2( $old ) {
*
* @since 6.6.0
*
* @param array $old Data to migrate.
* @param string $origin What source of data this object represents.
* One of 'default', 'theme', or 'custom'.
*
* @param array $old Data to migrate.
* @param string $origin What source of data this object represents.
* One of 'blocks', 'default', 'theme', or 'custom'.
* @return array Data with defaultFontSizes set to false.
*/
private static function migrate_v2_to_v3( $old, $origin ) {
Expand Down