From 80d68d4e4e7e9b231e6c9d2fc33f90646d42da86 Mon Sep 17 00:00:00 2001
From: Andrew Gosali <andrewgosali@gmail.com>
Date: Wed, 11 Jun 2025 13:24:17 +0700
Subject: [PATCH 1/2] MDL-85825 core_form: enable hideIf() on header element

---
 customfield/field/number/classes/field_controller.php | 2 +-
 lib/formslib.php                                      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/customfield/field/number/classes/field_controller.php b/customfield/field/number/classes/field_controller.php
index d10a9b83d2e..dd9c5899edb 100644
--- a/customfield/field/number/classes/field_controller.php
+++ b/customfield/field/number/classes/field_controller.php
@@ -76,7 +76,7 @@ class field_controller  extends \core_customfield\field_controller {
         $mform->setType('configdata[decimalplaces]', PARAM_INT);
 
         // Display format settings.
-        // TODO: Change this after MDL-82996 fixed.
+        // TODO: Change this after MDL-85825 fixed.
         $randelname = 'str_display_format';
         $mform->addGroup([], $randelname, html_writer::tag('h4', get_string('headerdisplaysettings', 'customfield_number')));
 
diff --git a/lib/formslib.php b/lib/formslib.php
index 68716fb07b3..895f76c1c03 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -3187,7 +3187,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\"><div>";
 
     /** @var string Template used when opening a fieldset */
-    var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id}>";
+    var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id} {name}>";
 
     /** @var string Template used when closing a fieldset */
     var $_closeFieldsetTemplate = "\n\t\t</div></fieldset>";
@@ -3571,7 +3571,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
 
         // Define collapsible classes for fieldsets.
         $arialive = '';
-        $fieldsetclasses = array('clearfix');
+        $fieldsetclasses = ['clearfix', 'fitem'];
         if (isset($this->_collapsibleElements[$header->getName()])) {
             $fieldsetclasses[] = 'collapsible';
             if ($this->_collapsibleElements[$header->getName()]) {
@@ -3589,6 +3589,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         }
 
         $openFieldsetTemplate = str_replace('{id}', $id, $this->_openFieldsetTemplate);
+        $openFieldsetTemplate = str_replace('{name}', ' name="' . $name . '"', $openFieldsetTemplate);
         $openFieldsetTemplate = str_replace('{classes}', join(' ', $fieldsetclasses), $openFieldsetTemplate);
 
         $this->_html .= $openFieldsetTemplate . $headerhtml;

From 889a9b6af052a19873ce2e9984a0466c8362d9e8 Mon Sep 17 00:00:00 2001
From: Jayce Birrell <jayce88@live.com.au>
Date: Thu, 26 Jun 2025 15:23:45 +0930
Subject: [PATCH 2/2] MDL-85825 behat: Exclude fieldsets

Fieldsets were getting incorrectly picked up from the 'form_row' selector
which was causing the i_expand_the_autocomplete() function to target the wrong element
---
 lib/behat/classes/partial_named_selector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index 0fcc8afc04d..5951f2be8d0 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -283,7 +283,7 @@ XPATH
         , 'form_row' => <<<XPATH
 .//*[contains(concat(' ', @class, ' '), ' col-form-label ')]
     [normalize-space(.)= %locator%]
-    /ancestor::*[contains(concat(' ', @class, ' '), ' fitem ')]
+    /ancestor::*[contains(concat(' ', @class, ' '), ' fitem ') and not(self::fieldset)]
 XPATH
         , 'autocomplete_selection' => <<<XPATH
 .//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', 'form-autocomplete-selection', ' '))]/span[@role='option'][contains(normalize-space(.), %locator%)]