Changeset 56779 for branches/6.3/src/wp-includes/class-wp-theme-json.php

Timestamp:

10/04/2023 07:08:55 PM (2 years ago)

Author:

audrasjb

Message:

Editor: Preserve block style variations when securing theme.

Adds the ability to process block style variations to the remove_insecure_properties function of theme json class.

Props dsas, ramonopoly, dean, isabel_brison, joemcgill, audrasjb.
Merges [56502] and [56778] to the 6.3 branch.
Fixes #59108.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

branches/6.3/src/wp-includes/class-wp-theme-json.php

@@ -2850 +2850 @@
      *
      * @since 5.9.0
+     * @since 6.3.2 Preserves global styles block variations when securing styles.
      *
      * @param array $theme_json Structure to sanitize.
@@ -2910 +2911 @@
             if ( ! empty( $output ) ) {
                 _wp_array_set( $sanitized, $metadata['path'], $output );
+            }
+
+            if ( isset( $metadata['variations'] ) ) {
+                foreach ( $metadata['variations'] as $variation ) {
+                    $variation_input = _wp_array_get( $theme_json, $variation['path'], array() );
+                    if ( empty( $variation_input ) ) {
+                        continue;
+                    }
+
+                    $variation_output = static::remove_insecure_styles( $variation_input );
+                    if ( ! empty( $variation_output ) ) {
+                        _wp_array_set( $sanitized, $variation['path'], $variation_output );
+                    }
+                }
             }
         }