Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle

This commit is contained in:
Andrew Nicols
2018-03-28 18:12:36 +02:00
committed by Eloy Lafuente (stronk7)
2 changed files with 5 additions and 2 deletions
+4 -2
View File
@@ -279,8 +279,10 @@ class feedback_item_multichoicerated extends feedback_item_base {
$options = array();
foreach ($lines as $idx => $line) {
list($weight, $optiontext) = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line);
$options[$idx + 1] = format_text("<span class=\"weight\">($weight) </span>".$optiontext,
FORMAT_HTML, array('noclean' => true, 'para' => false));
$a = new stdclass();
$a->weight = $weight;
$a->name = format_text($optiontext, FORMAT_HTML, array('noclean' => true, 'para' => false));
$options[$idx + 1] = get_string('multichoiceoption', 'feedback', $a);
}
if ($info->subtype === 'r' && !$this->hidenoselect($item)) {
$options = array(0 => get_string('not_selected', 'feedback')) + $options;
+1
View File
@@ -180,6 +180,7 @@ $string['modulename_link'] = 'mod/feedback/view';
$string['modulenameplural'] = 'Feedback';
$string['move_item'] = 'Move this question';
$string['multichoice'] = 'Multiple choice';
$string['multichoiceoption'] = '<span class="weight">({$a->weight}) </span>{$a->name}';
$string['multichoicerated'] = 'Multiple choice (rated)';
$string['multichoicetype'] = 'Multiple choice type';
$string['multichoice_values'] = 'Multiple choice values';