diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php index 5a864dd87a..bf9a4f90a0 100755 --- a/main/exercise/exercise.class.php +++ b/main/exercise/exercise.class.php @@ -4408,7 +4408,8 @@ class Exercise 0, 0, $objQuestionTmp->getFileUrl(true), - $results_disabled + $results_disabled, + $questionScore ); } elseif ($answerType == HOT_SPOT) { /** @@ -4769,7 +4770,8 @@ class Exercise $exeId, $questionId, $objQuestionTmp->getFileUrl(), - $results_disabled + $results_disabled, + $questionScore ).' '; diff --git a/main/inc/lib/exercise_show_functions.lib.php b/main/inc/lib/exercise_show_functions.lib.php index d730b51934..d0ebb14521 100755 --- a/main/inc/lib/exercise_show_functions.lib.php +++ b/main/inc/lib/exercise_show_functions.lib.php @@ -140,14 +140,23 @@ class ExerciseShowFunctions } /** - * @param $feedback_type - * @param $answer - * @param $id - * @param $questionId - * @param null $nano - * @param int $results_disabled + * @param $feedback_type + * @param $answer + * @param $id + * @param $questionId + * @param null $fileUrl + * @param int $results_disabled + * @param int $questionScore */ - public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0) + public static function display_oral_expression_answer( + $feedback_type, + $answer, + $id, + $questionId, + $fileUrl = null, + $results_disabled = 0, + $questionScore = 0 + ) { if (isset($fileUrl)) { echo ' @@ -161,7 +170,7 @@ class ExerciseShowFunctions echo ''; echo Display::tag('td', Security::remove_XSS($answer), array('width'=>'55%')); echo ''; - if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { + if (!$questionScore && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { echo ''; echo Display::tag('td', ExerciseLib::getNotCorrectedYetText(), array('width'=>'45%')); echo '';