moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle

Browse source
This commit is contained in:
David Monllao 2016-05-18 13:00:29 +08:00
commit 61e1d3d96c
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/formslib.php
View file

@ -2745,7 +2745,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
/** /**
* Create advance group of elements * Create advance group of elements
* *
* @param object $group Passed by reference * @param MoodleQuickForm_group $group Passed by reference
* @param bool $required if input is required field * @param bool $required if input is required field
* @param string $error error message to display * @param string $error error message to display
*/ */
@ -2753,6 +2753,12 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
// Make sure the element has an id. // Make sure the element has an id.
$group->_generateId(); $group->_generateId();
// Prepend 'fgroup_' to the ID we generated.
$groupid = 'fgroup_' . $group->getAttribute('id');
// Update the ID.
$group->updateAttributes(array('id' => $groupid));
if (method_exists($group, 'getElementTemplateType')){ if (method_exists($group, 'getElementTemplateType')){
$html = $this->_elementTemplates[$group->getElementTemplateType()]; $html = $this->_elementTemplates[$group->getElementTemplateType()];
}else{ }else{
@ -2772,7 +2778,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
}else{ }else{
$html =str_replace('{help}', '', $html); $html =str_replace('{help}', '', $html);
} }
$html =str_replace('{id}', 'fgroup_' . $group->getAttribute('id'), $html); $html = str_replace('{id}', $group->getAttribute('id'), $html);
$html =str_replace('{name}', $group->getName(), $html); $html =str_replace('{name}', $group->getName(), $html);
$html =str_replace('{type}', 'fgroup', $html); $html =str_replace('{type}', 'fgroup', $html);
$html =str_replace('{class}', $group->getAttribute('class'), $html); $html =str_replace('{class}', $group->getAttribute('class'), $html);