Changeset 54160 for trunk/src/wp-includes/block-editor.php

Timestamp:

09/14/2022 03:50:01 PM (4 years ago)

Author:

hellofromTonya

Message:

Editor: Revert [54159].

Reverting changeset due to failing PHPUnit tests. Tests pass without changeset [54156], but fail with it. Reverting to explore why in the original PR after rebasing.

See #56467.

File:

• trunk/src/wp-includes/block-editor.php (modified) (3 diffs)

trunk/src/wp-includes/block-editor.php

@@ -210 +210 @@
                 'disableCustomFontSizes'           => get_theme_support( 'disable-custom-font-sizes' ),
                 'disableCustomGradients'           => get_theme_support( 'disable-custom-gradients' ),
-                'disableLayoutStyles'              => get_theme_support( 'disable-layout-styles' ),
                 'enableCustomLineHeight'           => get_theme_support( 'custom-line-height' ),
                 'enableCustomSpacing'              => get_theme_support( 'custom-spacing' ),
@@ -419 +418 @@
                         $global_styles[]      = $block_classes;
                 }
-        } else {
-                // If there is no `theme.json` file, ensure base layout styles are still available.
-                $block_classes = array(
-                        'css'            => 'base-layout-styles',
-                        '__unstableType' => 'base-layout',
-                        'isGlobalStyles' => true,
-                );
-                $actual_css    = wp_get_global_stylesheet( array( $block_classes['css'] ) );
-                if ( '' !== $actual_css ) {
-                        $block_classes['css'] = $actual_css;
-                        $global_styles[]  = $block_classes;
-                }
         }
 
@@ -488 +475 @@
                 unset( $editor_settings['__experimentalFeatures']['spacing']['padding'] );
         }
-        if ( isset( $editor_settings['__experimentalFeatures']['spacing']['customSpacingSize'] ) ) {
-                $editor_settings['disableCustomSpacingSizes'] = ! $editor_ettings['__experimentalFeatures']['spacing']['customSpacingSize'];
-                unset( $editor_settings['__experimentalFeatures']['spacing']['customSpacingSize'] );
-        }
-        if ( isset( $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'] ) ) {
-                $spacing_sizes_by_origin  = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
-                $editor_settings['spacingSizes'] = isset( $spacing_sizes_by_origin['custom'] ) ?
-                        $spacing_sizes_by_origin['custom'] : (
-                                isset( $spacing_sizes_by_origin['theme'] ) ?
-                                        $spacing_sizes_by_origin['theme'] :
-                                        $spacing_sizes_by_origin['default']
-                        );
-        }
 
         $editor_settings['__unstableResolvedAssets']         = _wp_get_iframed_editor_assets();
         $editor_settings['localAutosaveInterval']            = 15;
-        $editor_settings['disableLayoutStyles']              = current_theme_supports( 'disable-layout-styles' );
         $editor_settings['__experimentalDiscussionSettings'] = array(
                 'commentOrder'         => get_option( 'comment_order' ),