Revert "Fix conflict - refs #8237"

This reverts commit fe0e5a586c.
10 years ago · 9cb2a9214c
parent 6096b797f6
commit 9cb2a9214c
1 changed files with 2 additions and 1 deletions
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@ -3826,7 +3826,7 @@ class Exercise
                        $queryfill = "SELECT answer FROM ".$TBL_TRACK_ATTEMPT."
                                      WHERE
                                        exe_id = '".$exeId."' AND
-                                        question_id= ".intval($questionId)  ;
+                                        question_id= ".intval($questionId);
                        $resfill = Database::query($queryfill);
                        $rowFill = Database::fetch_assoc($resfill);
                        $answer = $rowFill['answer'];
@ -4605,6 +4605,7 @@ class Exercise
                                $answer,
                                $studentChoice,
                                $answerComment,
+                                $results_disabled
                                $results_disabled,
                                $answerId
                            );