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

Author: NicoDucou

main/exercise/fill_blanks.class.php

@@ -1201,7 +1201,8 @@ public static function getHtmlDisplayForAnswer(
         $answer,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         $result = '';
         $listStudentAnswerInfo = self::getAnswerInfo($answer, true);
@@ -1215,15 +1216,17 @@ public static function getHtmlDisplayForAnswer(
                     $listStudentAnswerInfo['words'][$i],
                     $feedbackType,
                     $resultsDisabled,
-                    $showTotalScoreAndUserChoices
+                    $showTotalScoreAndUserChoices,
+                    $exercise
                 );
             } else {
                 $listStudentAnswerInfo['student_answer'][$i] = self::getHtmlWrongAnswer(
                     $listStudentAnswerInfo['student_answer'][$i],
                     $listStudentAnswerInfo['words'][$i],
                     $feedbackType,
                     $resultsDisabled,
-                    $showTotalScoreAndUserChoices
+                    $showTotalScoreAndUserChoices,
+                    $exercise
                 );
             }
         }
@@ -1264,10 +1267,14 @@ public static function getHtmlAnswer(
         $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,15 +1363,17 @@ public static function getHtmlRightAnswer(
         $correct,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         return self::getHtmlAnswer(
             $answer,
             $correct,
             true,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
     }
 
@@ -1384,15 +1393,17 @@ public static function getHtmlWrongAnswer(
         $correct,
         $feedbackType,
         $resultsDisabled = false,
-        $showTotalScoreAndUserChoices = false
+        $showTotalScoreAndUserChoices = false,
+        $exercise
     ) {
         return self::getHtmlAnswer(
             $answer,
             $correct,
             false,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
     }
 

main/inc/lib/exercise_show_functions.lib.php

@@ -30,7 +30,8 @@ public static function display_fill_in_blanks_answer(
             $answer,
             $feedbackType,
             $resultsDisabled,
-            $showTotalScoreAndUserChoices
+            $showTotalScoreAndUserChoices,
+            $exercise
         );
 
         if (empty($id)) {