Merge branch 'MDL-30689' of git://github.com/timhunt/moodle into MOOD…

…LE_20_STABLE

question/type/questiontype.php

@@ -488,7 +488,7 @@ function get_question_options(&$question) {
             $question->options->answers = $DB->get_records_sql("
                     SELECT qa.*, qax." . implode(', qax.', $extra_answer_fields) . "
                     FROM {question_answers} qa, {$answer_extension_table} qax
-                    WHERE qa.questionid = ? AND qax.answerid = qa.id", array($question->id));
+                    WHERE qa.question = ? AND qax.answerid = qa.id", array($question->id));
             if (!$question->options->answers) {
                 echo $OUTPUT->notification("Failed to load question answers from the table $answer_extension_table for questionid " .
                         $question->id);