From 9cb2a9214cba10f5a3b40465211bc084d7e4bf69 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 20 May 2016 10:41:57 -0500
Subject: [PATCH] Revert "Fix conflict - refs #8237"

This reverts commit fe0e5a586c1cfaa8dd1b370cdc915d472c25d5db.
---
 main/exercice/exercise.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index fb59cb63cc..da6441a1c6 100755
--- 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
                             );