From 4464734bb6f58badf73a4793fa2ba3b6d13c5790 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Tue, 7 Jun 2011 14:38:05 +0100
Subject: [PATCH] MDL-27747 qtype_truefalse, false feedback went missing
 whenre-editing a question. #465

---
 question/type/truefalse/edit_truefalse_form.php | 30 ++++++++++---------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/question/type/truefalse/edit_truefalse_form.php b/question/type/truefalse/edit_truefalse_form.php
index 599e12561ed..936035c801d 100644
--- a/question/type/truefalse/edit_truefalse_form.php
+++ b/question/type/truefalse/edit_truefalse_form.php
@@ -75,23 +75,19 @@ class qtype_truefalse_edit_form extends question_edit_form {
 
             $draftid = file_get_submitted_draft_itemid('trueanswer');
             $answerid = $question->options->trueanswer;
-            $text = $trueanswer->feedback;
 
             $question->feedbacktrue = array();
-            $question->feedbacktrue['text'] = $trueanswer->feedback;
             $question->feedbacktrue['format'] = $trueanswer->feedbackformat;
             $question->feedbacktrue['text'] = file_prepare_draft_area(
-                $draftid,       // draftid
-                $this->context->id,    // context
-                'question',     // component
-                'answerfeedback',        // filarea
-                !empty($answerid)?(int)$answerid:null, // itemid
-                $this->fileoptions,    // options
-                $text      // text
+                $draftid,             // draftid
+                $this->context->id,   // context
+                'question',           // component
+                'answerfeedback',     // filarea
+                !empty($answerid) ? (int) $answerid : null, // itemid
+                $this->fileoptions,   // options
+                $trueanswer->feedback // text
             );
             $question->feedbacktrue['itemid'] = $draftid;
-
-            return $question;
         }
 
         if (!empty($question->options->falseanswer)) {
@@ -99,19 +95,17 @@ class qtype_truefalse_edit_form extends question_edit_form {
 
             $draftid = file_get_submitted_draft_itemid('falseanswer');
             $answerid = $question->options->falseanswer;
-            $text = $falseanswer->feedback;
 
             $question->feedbackfalse = array();
-            $question->feedbackfalse['text'] = $falseanswer->feedback;
             $question->feedbackfalse['format'] = $falseanswer->feedbackformat;
             $question->feedbackfalse['text'] = file_prepare_draft_area(
-                $draftid,       // draftid
+                $draftid,              // draftid
                 $this->context->id,    // context
-                'question',     // component
-                'answerfeedback',        // filarea
-                !empty($answerid)?(int)$answerid:null, // itemid
+                'question',            // component
+                'answerfeedback',      // filarea
+                !empty($answerid) ? (int) $answerid : null, // itemid
                 $this->fileoptions,    // options
-                $text      // text
+                $falseanswer->feedback // text
             );
             $question->feedbackfalse['itemid'] = $draftid;
         }
-- 
2.11.4.GIT