Exercise: Fix hide_expected_answer exercise option for fill in the blank question type - refs BT#21969

main/exercise/fill_blanks.class.php

@@ -1201,7 +1201,8 @@ class FillBlanks extends Question
         $answer,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         $result = '';
         $listStudentAnswerInfo = self::getAnswerInfo($answer, true);
@@ -1215,7 +1216,8 @@ class FillBlanks extends Question
                     $listStudentAnswerInfo['words'][$i],
                     $feedbackType,
                     $resultsDisabled,
-                    $showTotalScoreAndUserChoices
+                    $showTotalScoreAndUserChoices,
+                    $exercise
                 );
             } else {
                 $listStudentAnswerInfo['student_answer'][$i] = self::getHtmlWrongAnswer(
@@ -1223,7 +1225,8 @@ class FillBlanks extends Question
                     $listStudentAnswerInfo['words'][$i],
                     $feedbackType,
                     $resultsDisabled,
-                    $showTotalScoreAndUserChoices
+                    $showTotalScoreAndUserChoices,
+                    $exercise
                 );
             }
         }
@@ -1264,10 +1267,14 @@ class FillBlanks extends Question
         $right,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         $hideExpectedAnswer = false;
         $hideUserSelection = false;
+        if (!$exercise->showExpectedChoiceColumn()) {
+            $hideExpectedAnswer = true;
+        }
         switch ($resultsDisabled) {
             case RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING:
             case RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER:
@@ -1356,7 +1363,8 @@ class FillBlanks extends Question
         $correct,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         return self::getHtmlAnswer(
             $answer,
@@ -1364,7 +1372,8 @@ class FillBlanks extends Question
             true,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
     }
 
@@ -1384,7 +1393,8 @@ class FillBlanks extends Question
         $correct,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         return self::getHtmlAnswer(
             $answer,
@@ -1392,7 +1402,8 @@ class FillBlanks extends Question
             false,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
     }
 

main/inc/lib/exercise_show_functions.lib.php

@@ -30,7 +30,8 @@ class ExerciseShowFunctions
             $answer,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
 
         if (empty($id)) {