diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php
index 388721be299..3106d9f5d16 100644
--- a/mod/quiz/report/analysis/report.php
+++ b/mod/quiz/report/analysis/report.php
@@ -331,7 +331,7 @@ class quiz_report extends quiz_default_report {
                     $qclass = 'partialcorrect';
                 }
                 $response->credit = '<span class="'.$qclass.'">('.format_float($q['credits'][$aid],2).') </span>';
-                $response->text = '<span class="'.$qclass.'">'.format_text("$resp", FORMAT_MOODLE, $format_options, $quiz->course).' </span>';
+                $response->text = '<span class="'.$qclass.'">'.format_text($resp, FORMAT_MOODLE, $format_options, $quiz->course).' </span>';
                 $count = $q['rcounts'][$aid].'/'.$q['count'];
                 $response->rcount = $count;
                 $response->rpercent =  '('.format_float($q['rcounts'][$aid]/$q['count']*100,0).'%)';
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 4859b4a429a..08e7ce3fe16 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -255,7 +255,7 @@ class default_questiontype {
         }
 
         if (empty($question->name)) {
-            $question->name = substr(strip_tags($question->questiontext), 0, 15);
+            $question->name = shorten_text($question->questiontext, 15);
             if (empty($question->name)) {
                 $question->name = '-';
             }
@@ -681,8 +681,7 @@ class default_questiontype {
        // change length to truncate responses here if you want
        $lmax = 40;
        if (!empty($state->responses)) {
-              $responses[] = (strlen($state->responses['']) > $lmax) ?
-               substr($state->responses[''], 0, $lmax).'...' : $state->responses[''];
+           $responses[] = shorten_text(stripslashes($state->responses['']), 45);
        } else {
            $responses[] = '';
        }