From d28ca2be6ff87dcdd701ae8df1e26f394b1367e3 Mon Sep 17 00:00:00 2001 From: gustav_delius Date: Sun, 5 Feb 2006 18:58:49 +0000 Subject: [PATCH] Fixing image link, closing bug 4489 --- mod/quiz/questionlib.php | 6 +++--- mod/quiz/questiontypes/description/questiontype.php | 2 +- mod/quiz/questiontypes/essay/questiontype.php | 2 +- mod/quiz/questiontypes/match/questiontype.php | 2 +- mod/quiz/questiontypes/multianswer/questiontype.php | 2 +- mod/quiz/questiontypes/multichoice/questiontype.php | 2 +- mod/quiz/questiontypes/numerical/questiontype.php | 2 +- mod/quiz/questiontypes/questiontype.php | 2 +- mod/quiz/questiontypes/shortanswer/questiontype.php | 2 +- mod/quiz/questiontypes/truefalse/questiontype.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mod/quiz/questionlib.php b/mod/quiz/questionlib.php index ccf78f33331..309fd9b7b6d 100644 --- a/mod/quiz/questionlib.php +++ b/mod/quiz/questionlib.php @@ -806,7 +806,7 @@ function quiz_print_question_icon($question, $editlink=true, $return = false) { * * @param object $question The question object */ -function quiz_print_possible_question_image($question) { +function quiz_print_possible_question_image($question, $courseid) { global $CFG; @@ -817,10 +817,10 @@ function quiz_print_possible_question_image($question) { echo $question->image; } else if ($CFG->slasharguments) { // Use this method if possible for better caching - echo "$CFG->wwwroot/file.php/$question->image"; + echo "$CFG->wwwroot/file.php/$courseid/$question->image"; } else { - echo "$CFG->wwwroot/file.php?file=$question->image"; + echo "$CFG->wwwroot/file.php?file=$courseid/$question->image"; } echo '" alt="" />'; diff --git a/mod/quiz/questiontypes/description/questiontype.php b/mod/quiz/questiontypes/description/questiontype.php index a6cb1e0b8ac..e6d0a698a1d 100644 --- a/mod/quiz/questiontypes/description/questiontype.php +++ b/mod/quiz/questiontypes/description/questiontype.php @@ -32,7 +32,7 @@ class quiz_description_qtype extends quiz_default_questiontype { echo format_text($question->questiontext, $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); print_simple_box_end('center', '90%'); } diff --git a/mod/quiz/questiontypes/essay/questiontype.php b/mod/quiz/questiontypes/essay/questiontype.php index 9533e94f1cc..56ab4e194a4 100644 --- a/mod/quiz/questiontypes/essay/questiontype.php +++ b/mod/quiz/questiontypes/essay/questiontype.php @@ -80,7 +80,7 @@ class quiz_essay_qtype extends quiz_default_questiontype { $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); /// Print input controls $stranswer = get_string("answer", "quiz"); diff --git a/mod/quiz/questiontypes/match/questiontype.php b/mod/quiz/questiontypes/match/questiontype.php index 12aa546da8d..405d9ef9fac 100644 --- a/mod/quiz/questiontypes/match/questiontype.php +++ b/mod/quiz/questiontypes/match/questiontype.php @@ -213,7 +213,7 @@ class quiz_match_qtype extends quiz_default_questiontype { $question->questiontextformat, NULL, $cmoptions->course); } - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); ///// Print the input controls ////// echo ''; diff --git a/mod/quiz/questiontypes/multianswer/questiontype.php b/mod/quiz/questiontypes/multianswer/questiontype.php index 0fbc3acf051..6275b2bdff5 100644 --- a/mod/quiz/questiontypes/multianswer/questiontype.php +++ b/mod/quiz/questiontypes/multianswer/questiontype.php @@ -187,7 +187,7 @@ class quiz_embedded_cloze_qtype extends quiz_default_questiontype { $nameprefix = $question->name_prefix; // For this question type, we better print the image on top: - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); $qtextremaining = format_text($question->questiontext, $question->questiontextformat, diff --git a/mod/quiz/questiontypes/multichoice/questiontype.php b/mod/quiz/questiontypes/multichoice/questiontype.php index 01a0cfcd75f..6aa35072a77 100644 --- a/mod/quiz/questiontypes/multichoice/questiontype.php +++ b/mod/quiz/questiontypes/multichoice/questiontype.php @@ -254,7 +254,7 @@ class quiz_multichoice_qtype extends quiz_default_questiontype { echo format_text($question->questiontext, $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); // Print input controls and alternatives echo '
'; diff --git a/mod/quiz/questiontypes/numerical/questiontype.php b/mod/quiz/questiontypes/numerical/questiontype.php index d82408208aa..bb35e9d4725 100644 --- a/mod/quiz/questiontypes/numerical/questiontype.php +++ b/mod/quiz/questiontypes/numerical/questiontype.php @@ -274,7 +274,7 @@ class quiz_numerical_qtype extends quiz_shortanswer_qtype { echo format_text($question->questiontext, $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); /// Print input controls diff --git a/mod/quiz/questiontypes/questiontype.php b/mod/quiz/questiontypes/questiontype.php index 6f04cc78c49..ee06b5eefbf 100644 --- a/mod/quiz/questiontypes/questiontype.php +++ b/mod/quiz/questiontypes/questiontype.php @@ -288,7 +288,7 @@ class quiz_default_questiontype { * a correct answer if there are many, is returned. This is used by some question * types in the {@link grade_responses()} function but it is also used by the * question preview screen to fill in correct responses. - * @return mixed An array of values giving the responses corresponding + * @return mixed A response array giving the responses corresponding * to the (or a) correct answer to the question. If there is * no correct answer that scores 100% then null is returned. * @param object $question The question for which the correct answer is to diff --git a/mod/quiz/questiontypes/shortanswer/questiontype.php b/mod/quiz/questiontypes/shortanswer/questiontype.php index 85ef0e2524a..9579b185578 100644 --- a/mod/quiz/questiontypes/shortanswer/questiontype.php +++ b/mod/quiz/questiontypes/shortanswer/questiontype.php @@ -118,7 +118,7 @@ class quiz_shortanswer_qtype extends quiz_default_questiontype { echo format_text($question->questiontext, $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); /// Print input controls diff --git a/mod/quiz/questiontypes/truefalse/questiontype.php b/mod/quiz/questiontypes/truefalse/questiontype.php index 3378dec3261..303b9bb55fb 100644 --- a/mod/quiz/questiontypes/truefalse/questiontype.php +++ b/mod/quiz/questiontypes/truefalse/questiontype.php @@ -133,7 +133,7 @@ class quiz_truefalse_qtype extends quiz_default_questiontype { echo format_text($question->questiontext, $question->questiontextformat, NULL, $cmoptions->course); - quiz_print_possible_question_image($question); + quiz_print_possible_question_image($question, $cmoptions->course); // Update the answer strings $stranswer = get_string('answer', 'quiz');