Ticket #55161: 55161-2.diff

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

@@ -1092 +1092 @@
                                 $slug = _wp_to_kebab_case( $preset['slug'] );
 
                                 $value = '';
-                                if ( isset( $preset_metadata['value_key'] ) ) {
+                                if ( isset( $preset_metadata['value_key'], $preset[ $preset_metadata['value_key'] ] ) ) {
                                         $value_key = $preset_metadata['value_key'];
                                         $value     = $preset[ $value_key ];
                                 } elseif (
@@ -1803 +1803 @@
                                                 sanitize_html_class( $preset['slug'] ) === $preset['slug']
                                         ) {
                                                 $value = null;
-                                                if ( isset( $preset_metadata['value_key'] ) ) {
+                                                if ( isset( $preset_metadata['value_key'], $preset[ $preset_metadata['value_key'] ] ) ) {
                                                         $value = $preset[ $preset_metadata['value_key'] ];
                                                 } elseif (
                                                         isset( $preset_metadata['value_func'] ) &&