Skip to content

Global Styles: Fix block spacing values being stripped for users without unfiltered_html capability #3742

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

Closed
andrewserong wants to merge 12 commits into from
Closed

Global Styles: Fix block spacing values being stripped for users without unfiltered_html capability #3742

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b0f4e16
Global Styles: Fix block spacing values being stripped for uses witho…
andrewserong Dec 13, 2022
95b1159
Update tests/phpunit/tests/theme/wpThemeJson.php
andrewserong Dec 13, 2022
b874edb
Update tests/phpunit/tests/theme/wpThemeJson.php
andrewserong Dec 13, 2022
76663b2
Remove accidental inclusion of kses_init_filters
andrewserong Dec 13, 2022
1df41be
Small tweaks based on feedback
andrewserong Dec 13, 2022
b7f4a5d
Add support for contentSize and wideSize settings values
andrewserong Jan 3, 2023
002720b
Update doc comment to reflect that the value is now an array of arrays
andrewserong Jan 3, 2023
d694183
Fix indent linting issue
andrewserong Jan 3, 2023
352cb94
Update isset check for null to reflect earlier feedback
andrewserong Jan 3, 2023
60efc3d
Update code comment
andrewserong Jan 9, 2023
c05ca99
Encapsulate and simplify redundant code
hellofromtonya Jan 23, 2023
69d2ab0
Merge branch 'trunk' into fix/global-spacing-stripped-block-spacing-v…
peterwilsoncc Feb 15, 2023
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
Small tweaks based on feedback
  • Loading branch information
@andrewserong
andrewserong committed Jan 3, 2023
commit 1df41be19dc9bcedd419c52b3899c57e76145268
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2788,7 +2788,7 @@ protected static function remove_insecure_styles( $input ) {
foreach ( static::INDIRECT_PROPERTIES_METADATA as $property => $path ) {
$value = _wp_array_get( $input, $path, array() );
if (
isset( $value ) &&
null !== $value &&
! is_array( $value ) &&
static::is_safe_css_declaration( $property, $value )
) {
Expand Down
18 changes: 9 additions & 9 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,43 +2394,43 @@ public function test_remove_insecure_properties_should_allow_indirect_properties
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(
'spacing' => array(
'blockGap' => '3em',
),
'blocks' => array(
'core/social-links' => array(
'spacing' => array(
'blockGap' => array(
'top' => '1em',
'left' => '2em',
'top' => '1em',
),
),
),
),
'spacing' => array(
'blockGap' => '3em',
),
),
)
);

$expected = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(
'spacing' => array(
'blockGap' => '3em',
),
'blocks' => array(
'core/social-links' => array(
'spacing' => array(
'blockGap' => array(
'top' => '1em',
'left' => '2em',
'top' => '1em',
),
),
),
),
'spacing' => array(
'blockGap' => '3em',
),
),
);

$this->assertEqualSetsWithIndex( $expected, $actual );
$this->assertSameSetsWithIndex( $expected, $actual );
}

/**
Expand Down