Merge pull request #15781 from craftcms/bugfix/15764-element-conditio…

…n-fields-with-the-same-label

condition builder - allow fields with the same label to show (if there’s a hint specified)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Element conditions now show rules for fields with the same name but unique handles, if the “Show field handles in edit forms” user preference is enabled. ([#15764](https://github.com/craftcms/cms/issues/15764))
 - Auto-generated handles, slugs, etc. now update immediately when the source input is changed. ([#15754](https://github.com/craftcms/cms/issues/15754))
 - Fixed a bug where Table fields’ Default Values table could lose existing rows if they only consisted of Dropdown columns without configured options.
 - Fixed a bug where custom fields’ `required` properties were always `false`. ([#15752](https://github.com/craftcms/cms/issues/15752))

src/elements/conditions/ElementCondition.php

@@ -199,13 +199,11 @@ protected function selectableConditionRules(): array
                 $types[] = TitleConditionRule::class;
             }
 
-            $fieldLabels = [];
-
             foreach ($this->getFieldLayouts() as $fieldLayout) {
                 foreach ($fieldLayout->getCustomFieldElements() as $layoutElement) {
-                    // Discard fields with empty/non-unique labels
+                    // Discard fields with empty labels
                     $label = $layoutElement->label();
-                    if ($label === null || isset($fieldLabels[$label])) {
+                    if ($label === null) {
                         continue;
                     }
                     $field = $layoutElement->getField();
@@ -214,8 +212,6 @@ protected function selectableConditionRules(): array
                         continue;
                     }
 
-                    $fieldLabels[$label] = true;
-
                     if (is_string($type)) {
                         $type = ['class' => $type];
                     }