MDL-23561 Fixed support for addHelpButton() in repeated elements

BenKelada · Jul 29, 2010 · cd18808 · cd18808
1 parent 80f58e8
commit cd18808
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/formslib.php b/lib/formslib.php
@@ -914,7 +914,8 @@ function repeat_elements($elementobjs, $repeats, $options, $repeathiddenname,
                             $mform->setDefault($realelementname, $params);
                             break;
                         case 'helpbutton' :
-                            $mform->addHelpButton($realelementname, $params);
+                            $params = array_merge(array($realelementname), $params);
+                            call_user_func_array(array(&$mform, 'addHelpButton'), $params);
                             break;
                         case 'disabledif' :
                             foreach ($namecloned as $num => $name){

diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php
@@ -51,8 +51,7 @@ function definition() {
         $repeateloptions['limit']['disabledif'] = array('limitanswers', 'eq', 0);
         $mform->setType('limit', PARAM_INT);
 
-        //TODO: MDL-23561 temp workaround for fatal errors caused by following line
-        //$repeateloptions['option']['helpbutton'] = array('choiceoptions', get_string('modulenameplural', 'choice'), 'choice');
+        $repeateloptions['option']['helpbutton'] = array('choiceoptions', 'choice');
         $mform->setType('option', PARAM_CLEAN);
 
         $mform->setType('optionid', PARAM_INT);