MDL-12070 - re-enable the use of HTML in choice options

Merged from MOODLE_18_STABLE

diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php
index 2a0ae3a05a19e1f928101bd67e64787a29b9212e..95452b2ba6c05ce43302a0e5cd711710acb06921 100644 (file)
--- a/mod/choice/mod_form.php
+++ b/mod/choice/mod_form.php
@@ -49,7 +49,7 @@ class mod_choice_mod_form extends moodleform_mod {
         $mform->setType('limit', PARAM_INT);
 
         $repeateloptions['option']['helpbutton'] = array('options', get_string('modulenameplural', 'choice'), 'choice');
-        $mform->setType('option', PARAM_TEXT);
+        $mform->setType('option', PARAM_CLEANHTML);
 
         $mform->setType('optionid', PARAM_INT);
 
@@ -148,4 +148,4 @@ class mod_choice_mod_form extends moodleform_mod {
     }
 
 }
-?>
\ No newline at end of file
+?>