From 43b386a3a4ab3aaac2075fb49e52a009fd8839b7 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Mon, 25 Sep 2023 10:03:15 +0000
Subject: [PATCH] drop formatReady for items where no formatted input is
available, fixes #3222
Closes #3222
Merge request studip/studip!2185
---
.../question_types/freetext/freetext_evaluation.php | 2 +-
.../questionnaire/question_types/likert/likert_evaluation.php | 2 +-
.../question_types/rangescale/rangescale_evaluation.php | 2 +-
app/views/questionnaire/question_types/vote/vote_answer.php | 2 +-
.../questionnaire/question_types/vote/vote_evaluation.php | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/questionnaire/question_types/freetext/freetext_evaluation.php b/app/views/questionnaire/question_types/freetext/freetext_evaluation.php
index 26608b0bb13..43c40025b95 100644
--- a/app/views/questionnaire/question_types/freetext/freetext_evaluation.php
+++ b/app/views/questionnaire/question_types/freetext/freetext_evaluation.php
@@ -28,7 +28,7 @@
<? endif ?>
</div>
<? endif ?>
- <?= formatReady($answer['answerdata']['text']) ?>
+ <?= htmlReady($answer['answerdata']['text']) ?>
</li>
<? endif ?>
<? endforeach ?>
diff --git a/app/views/questionnaire/question_types/likert/likert_evaluation.php b/app/views/questionnaire/question_types/likert/likert_evaluation.php
index 9130e768e16..9ac7872bea0 100644
--- a/app/views/questionnaire/question_types/likert/likert_evaluation.php
+++ b/app/views/questionnaire/question_types/likert/likert_evaluation.php
@@ -30,7 +30,7 @@ $options = $vote->questiondata['options'];
<? foreach ($vote->questiondata['statements'] as $key => $statement) : ?>
<tr>
<td>
- <strong><?= formatReady($statement) ?></strong>
+ <strong><?= htmlReady($statement) ?></strong>
</td>
<? foreach($options as $option_index => $option) : ?>
diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
index 6a3947c26a7..9fa57480297 100644
--- a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
+++ b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
@@ -30,7 +30,7 @@ $options = range($vote->questiondata['minimum'], $vote->questiondata['maximum'])
<? foreach ($vote->questiondata['statements'] as $key => $statement) : ?>
<tr>
<td>
- <strong><?= formatReady($statement) ?></strong>
+ <strong><?= htmlReady($statement) ?></strong>
</td>
<? foreach($options as $option) : ?>
diff --git a/app/views/questionnaire/question_types/vote/vote_answer.php b/app/views/questionnaire/question_types/vote/vote_answer.php
index 23f14f41030..77d2224a10b 100644
--- a/app/views/questionnaire/question_types/vote/vote_answer.php
+++ b/app/views/questionnaire/question_types/vote/vote_answer.php
@@ -38,7 +38,7 @@ $responseData = $response['answerdata'] ? $response['answerdata']->getArrayCopy(
<?= isset($responseData['answers']) && $index == $responseData['answers'] ? 'checked' : '' ?>>
<? endif ?>
- <?= formatReady($answers[$index]) ?>
+ <?= htmlReady($answers[$index]) ?>
</label>
</li>
diff --git a/app/views/questionnaire/question_types/vote/vote_evaluation.php b/app/views/questionnaire/question_types/vote/vote_evaluation.php
index 8670f7b2f64..cd6f587802b 100644
--- a/app/views/questionnaire/question_types/vote/vote_evaluation.php
+++ b/app/views/questionnaire/question_types/vote/vote_evaluation.php
@@ -39,7 +39,7 @@ $ordered_answer_options = [];
$ordered_users = [];
foreach ($ordered_results as $index => $value) {
if ($value > 0) {
- $ordered_answer_options[] = strip_tags(formatReady($options[$index]));
+ $ordered_answer_options[] = $options[$index];
} else {
unset($ordered_results[$index]);
}
@@ -86,7 +86,7 @@ rsort($ordered_results);
<? $percentage = ($countAnswers && isset($results[$key])) ? round((int) $results[$key] / $countAnswers * 100) : 0 ?>
<td style="text-align: right; background-size: <?= $percentage ?>% 100%; background-position: right center; background-image: url('<?= Assets::image_path("vote_lightgrey.png") ?>'); background-repeat: no-repeat;" width="50%">
- <strong><?= formatReady($answer) ?></strong>
+ <strong><?= htmlReady($answer) ?></strong>
</td>
<td style="white-space: nowrap;">
--
GitLab