Changeset 51213

Timestamp:

06/23/2021 12:25:14 AM (5 years ago)

Author:

desrosj

Message:

Editor: Correct variable names in get_block_editor_settings().

Incorrect variable names were leading to unreachable conditional statements.

Follow up to [51149].

Props johnbillion, mukesh27.
See #53458.

File:

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

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

@@ -311 +311 @@
         $editor_settings['__experimentalFeatures'] = $theme_json->get_settings();
         // These settings may need to be updated based on data coming from theme.json sources.
-        if ( isset( $settings['__experimentalFeatures']['color']['palette'] ) ) {
-                $colors_by_origin   = $settings['__experimentalFeatures']['color']['palette'];
-                $settings['colors'] = isset( $colors_by_origin['user'] ) ?
+        if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {
+                $colors_by_origin          = $editor_settings['__experimentalFeatures']['color']['palette'];
+                $editor_settings['colors'] = isset( $colors_by_origin['user'] ) ?
                         $colors_by_origin['user'] : (
                                 isset( $colors_by_origin['theme'] ) ?
@@ -320 +320 @@
                         );
         }
-        if ( isset( $settings['__experimentalFeatures']['color']['gradients'] ) ) {
-                $gradients_by_origin   = $settings['__experimentalFeatures']['color']['gradients'];
-                $settings['gradients'] = isset( $gradients_by_origin['user'] ) ?
+        if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
+                $gradients_by_origin          = $editor_settings['__experimentalFeatures']['color']['gradients'];
+                $editor_settings['gradients'] = isset( $gradients_by_origin['user'] ) ?
                         $gradients_by_origin['user'] : (
                                 isset( $gradients_by_origin['theme'] ) ?
@@ -329 +329 @@
                         );
         }
-        if ( isset( $settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
-                $font_sizes_by_origin  = $settings['__experimentalFeatures']['typography']['fontSizes'];
-                $settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ?
+        if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
+                $font_sizes_by_origin         = $editor_settings['__experimentalFeatures']['typography']['fontSizes'];
+                $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ?
                         $font_sizes_by_origin['user'] : (
                                 isset( $font_sizes_by_origin['theme'] ) ?