Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle

diff --cc mod/feedback/item/multichoice/lib.php
Simple merge

diff --cc mod/feedback/item/multichoice/multichoice_form.php
index b9b8785,3947171..18452dd
--- 1/mod/feedback/item/multichoice/multichoice_form.php
--- 2/mod/feedback/item/multichoice/multichoice_form.php
+++ b/mod/feedback/item/multichoice/multichoice_form.php
@@@ -63,11 -63,14 +63,12 @@@ class feedback_multichoice_form extend
          $mform->addElement('selectyesno',
                             'hidenoselect',
                             get_string('hide_no_select_option', 'feedback'));
+         $mform->disabledIf('hidenoselect', 'subtype', 'ne', 'r');
  
 -        $mform->addElement('static',
 -                           'hint',
 -                           get_string('multichoice_values', 'feedback'),
 -                           get_string('use_one_line_for_each_value', 'feedback'));
 +        $mform->addElement('textarea', 'values', get_string('multichoice_values', 'feedback'),
 +            'wrap="virtual" rows="10" cols="65"');
  
 -        $mform->addElement('textarea', 'values', '', 'wrap="virtual" rows="10" cols="65"');
 +        $mform->addElement('static', 'hint', '', get_string('use_one_line_for_each_value', 'feedback'));
  
          parent::definition();
          $this->set_data($item);