MDL-28183 fix for problem during integration

Conflicts:
	question/type/multianswer/question.php

diff --git a/question/type/multianswer/question.php b/question/type/multianswer/question.php
index 0759616..43c2ca7 100644 (file)
--- a/question/type/multianswer/question.php
+++ b/question/type/multianswer/question.php
@@ -238,8 +238,8 @@ class qtype_multianswer_question extends question_graded_automatically_with_coun
             list($subfraction, $newstate) = $subq->grade_response($subresp);
             if ($newstate != question_state::$gradedright) {
                 foreach ($subresp as $ind => $resp) {
-                    if (($subq->layout == qtype_multichoice_base::LAYOUT_VERTICAL)
-                            || ($subq->layout == qtype_multichoice_base::LAYOUT_HORIZONTAL)) {
+                    if ($subq->qtype == 'multichoice' && ($subq->layout == qtype_multichoice_base::LAYOUT_VERTICAL
+                            || $subq->layout == qtype_multichoice_base::LAYOUT_HORIZONTAL)) {
                         $response[$substep->add_prefix($ind)] = '-1';
                     } else {
                         $response[$substep->add_prefix($ind)] = '';