MDL-20636 Actually, passing to get_question summary is silly. Revert.

This commit is contained in:
Tim Hunt
2011-01-13 18:36:03 +00:00
parent 6d03299dec
commit ec3d4ef543
11 changed files with 40 additions and 162 deletions
+16 -3
View File
@@ -158,8 +158,8 @@ abstract class question_definition {
* inappropriate.
* @return string|null a plain text summary of this question.
*/
public function get_question_summary(question_attempt $qa) {
return html_to_text($this->format_questiontext($qa), 0, false);
public function get_question_summary() {
return $this->html_to_text($this->questiontext);
}
/**
@@ -197,7 +197,7 @@ abstract class question_definition {
* @return qtype_renderer the renderer to use for outputting this question.
*/
public function get_renderer() {
global $PAGE;
global $PAGE; // TODO get rid of this global.
return $PAGE->get_renderer('qtype_' . $this->qtype->name());
}
@@ -236,6 +236,7 @@ abstract class question_definition {
* @return string the text formatted for output by format_text.
*/
public function format_text($text, $qa, $component, $filearea, $itemid, $clean = false) {
// TODO format.
$formatoptions = new stdClass;
$formatoptions->noclean = !$clean;
$formatoptions->para = false;
@@ -243,6 +244,18 @@ abstract class question_definition {
return format_text($text, $this->questiontextformat, $formatoptions);
}
/**
* Convert some part of the question text to plain text. This might be used,
* for example, by get_response_summary().
* @param string $text The HTML to reduce to plain text.
*/
public function html_to_text($text) {
$formatoptions = new stdClass;
$formatoptions->noclean = true;
return html_to_text(format_text($text, $this->questiontextformat, $formatoptions),
0, false);
}
/** @return the result of applying {@link format_text()} to the question text. */
public function format_questiontext($qa) {
return $this->format_text($this->questiontext, $qa,