Ticket #47692: 47692-new.diff

wp-includes/class-wp-customize-control.php

@@ -116 +116 @@
         public $choices = array();
 
         /**
+        * Optgroup for select control.
+        *
+        * @since 5.3.0
+        * @var bool
+        */
+        public $optgroup = false;
+
+        /**
          * List of custom input attributes for control output, where attribute names are the keys and values are the values.
          *
          * Not used for 'checkbox', 'radio', 'select', 'textarea', or 'dropdown-pages' control types.
@@ -546 +554 @@
 
                                 <select id="<?php echo esc_attr( $input_id ); ?>" <?php echo $describedby_attr; ?> <?php $this->link(); ?>>
                                         <?php
-                                        foreach ( $this->choices as $value => $label ) {
-                                                echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                                        if ( $this->optgroup ) {
+                                                foreach ( $this->choices as $optgroup_label => $values ) {
+                                                        if ( is_array( $values ) ) {
+                                                                echo '<optgroup label="' .  esc_attr( $optgroup_label ) . '">';
+                                                                                foreach ( $values as $value => $label ) {
+                                                                                        if ( ! is_array( $label ) ) {
+                                                                                                echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                                                                                        }
+                                                                                }
+                                                                echo '</optgroup>';
+                                                        }
+                                                }
+                                        } else{
+                                                foreach ( $this->choices as $value => $label ) {
+                                                        if ( ! is_array( $label ) ) {
+                                                                echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                                                        }
+                                                }
                                         }
                                         ?>
                                 </select>