From a24948b64f0a229bc0595ed971739352d1828c7a Mon Sep 17 00:00:00 2001 From: tjhunt Date: Wed, 21 Mar 2007 23:25:09 +0000 Subject: [PATCH] MDL-7259 - Item analysis report does not use the right format_text settings. --- mod/quiz/report/analysis/report.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php index 389994bc66d..45b06b3a02c 100644 --- a/mod/quiz/report/analysis/report.php +++ b/mod/quiz/report/analysis/report.php @@ -296,6 +296,11 @@ class quiz_report extends quiz_default_report { } } + $format_options = new stdClass; + $format_options->para = false; + $format_options->noclean = true; + $format_options->newlines = false; + // Now it is time to page the data, simply slice the keys in the array if (!isset($pagesize) || ((int)$pagesize < 1) ){ $pagesize = 10; @@ -309,16 +314,12 @@ class quiz_report extends quiz_default_report { $qid = $q['id']; $question = get_record('question', 'id', $qid); $qnumber = " (".link_to_popup_window('/question/question.php?id='.$qid,'editquestion', $qid, 450, 550, get_string('edit'), 'none', true ).") "; - $qname = '
'.format_text($question->name." : ", $question->questiontextformat, NULL, $quiz->course).'
'; + $qname = '
'.format_text($question->name." : ", $question->questiontextformat, $format_options, $quiz->course).'
'; $qicon = print_question_icon($question, false, true); $qreview = quiz_get_question_review($quiz, $question); - $qtext = format_text($question->questiontext, $question->questiontextformat, NULL, $quiz->course); + $qtext = format_text($question->questiontext, $question->questiontextformat, $format_options, $quiz->course); $qquestion = $qname."\n".$qtext."\n"; - $format_options = new stdClass; - $format_options->para = false; - $format_options->newlines = false; - $responses = array(); foreach ($q['responses'] as $aid=>$resp){ $response = new stdClass; @@ -332,7 +333,7 @@ class quiz_report extends quiz_default_report { $response->credit = '('.format_float($q['credits'][$aid],2).') '; $response->text = ''.format_text("$resp", FORMAT_MOODLE, $format_options, $quiz->course).' '; $count = $q['rcounts'][$aid].'/'.$q['count']; - $response->rcount = $count; // format_text("$count", FORMAT_MOODLE, $format_options, $quiz->course); + $response->rcount = $count; $response->rpercent = '('.format_float($q['rcounts'][$aid]/$q['count']*100,0).'%)'; $responses[] = $response; } @@ -630,6 +631,7 @@ class quiz_report extends quiz_default_report { $options = new stdClass; $options->para = false; + $options->noclean = true; $options->newlines = false; $qtype = $question->qtype; @@ -637,6 +639,7 @@ class quiz_report extends quiz_default_report { $qname = format_text($question->name, FORMAT_MOODLE, $options); $qtext = format_text($question->questiontext, FORMAT_MOODLE, $options); + $responses = array(); foreach ($q['responses'] as $aid=>$resp){ $response = new stdClass; if ($q['credits'][$aid] <= 0) {