Changeset 52764

Timestamp:

02/17/2022 06:54:37 PM (5 years ago)

Author:

hellofromTonya

Message:

Editor: Adds an additional check to guard against incompete presets.

Adds an additional guard to ensure the value of $preset_metadata['value_key'] actually exists as a key in the $preset array. Fixes Warning: Undefined array key error.

Intentionally adds the check into the existing isset() as it's native to PHP, more efficient, and a good pattern.

Follow-up [52049].

Props jeherve, swissspidy, sergeybiryukov, jrf.
Merges [52763] to the 5.9 branch.
Fixes #55161.

Location:

branches/5.9

Files:

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

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

@@ -1093 +1093 @@
 
                                 $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 ];
@@ -1838 +1838 @@
                                         ) {
                                                 $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 (