diff --git a/core/lib/Drupal/Core/Render/Element/Select.php b/core/lib/Drupal/Core/Render/Element/Select.php index 7394614bb9..fa2e7377c1 100644 --- a/core/lib/Drupal/Core/Render/Element/Select.php +++ b/core/lib/Drupal/Core/Render/Element/Select.php @@ -154,7 +154,7 @@ public static function processSelect(&$element, FormStateInterface $form_state, } // Provide the correct default value for #sort_start. $element['#sort_start'] = $element['#sort_start'] ?? - ((isset($element['#empty_value'])) ? 1 : 0); + (isset($element['#empty_value']) ? 1 : 0); return $element; } diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php index cd8542c68e..becdef1618 100644 --- a/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php +++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php @@ -133,7 +133,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ]; // Add a select to test sorting at the top level, and with some of the - // option groups sorted, some left alone, and at least one with sort start + // option groups sorted, some left alone, and at least one with #sort_start // set to a non-default value. $sortable_options = $this->makeSortableOptions('sso'); $sortable_options['sso_zzgroup']['#sort_options'] = TRUE; @@ -147,7 +147,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ]; // Add a select to test sorting with a -NONE- option included, - // and a sort start set. + // and #sort_start set. $sortable_none_options = $this->makeSortableOptions('sno'); $sortable_none_options['sno_zzgroup']['#sort_options'] = TRUE; $form['sorted_none'] = [ @@ -159,7 +159,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ]; // Add a select to test sorting with a -NONE- option included, - // and sort start not set. + // and #sort_start not set. $sortable_none_nostart_options = $this->makeSortableOptions('snn'); $sortable_none_nostart_options['snn_zzgroup']['#sort_options'] = TRUE; $form['sorted_none_nostart'] = [