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

This commit is contained in:
Eloy Lafuente (stronk7) 2016-09-06 15:56:01 +02:00
commit 69e18dbf70
2 changed files with 6 additions and 6 deletions

View File

@ -110,7 +110,7 @@ class feedback_item_multichoice extends feedback_item_base {
$analysed_item = array();
$analysed_item[] = $item->typ;
$analysed_item[] = $item->name;
$analysed_item[] = format_string($item->name);
//get the possible answers
$answers = null;
@ -183,7 +183,7 @@ class feedback_item_multichoice extends feedback_item_base {
for ($i = 0; $i < $sizeofvallist; $i++) {
for ($k = 0; $k < $sizeofpresentation; $k++) {
if ($vallist[$i] == ($k + 1)) {//Die Werte beginnen bei 1, das Array aber mit 0
$printval .= trim($presentation[$k]) . chr(10);
$printval .= trim(format_string($presentation[$k])) . chr(10);
break;
}
}
@ -192,7 +192,7 @@ class feedback_item_multichoice extends feedback_item_base {
$index = 1;
foreach ($presentation as $pres) {
if ($value->value == $index) {
$printval = $pres;
$printval = format_string($pres);
break;
}
$index++;
@ -213,7 +213,7 @@ class feedback_item_multichoice extends feedback_item_base {
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
}
echo $itemname;
echo format_string($itemname);
echo '</th></tr>';
echo "</table>";
$analysed_vals = $analysed_item[2];

View File

@ -166,7 +166,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
foreach ($presentation as $pres) {
if ($value->value == $index) {
$item_label = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $pres);
$printval = $item_label[1];
$printval = format_string($item_label[1]);
break;
}
$index++;
@ -184,7 +184,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
}
echo $analysed_item[1];
echo format_string($analysed_item[1]);
echo '</th></tr>';
echo '</table>';
$analysed_vals = $analysed_item[2];