Bug #6293 - Cannot regrade a question when a teacher has added a comment with a ...

diff --git a/lib/questionlib.php b/lib/questionlib.php
index b1bb321522700ab6447a1fe153c7fa2c53b823ac..831bea14b6f005bcafba5d83a6b597f055b9f778 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -755,6 +755,8 @@ function save_question_session(&$question, &$state) {
             $session->newgraded = $state->id;
             $session->sumpenalty = $state->sumpenalty;
             $session->comment = $state->comment;
+        } else {
+            $session->comment = addslashes($session->comment);
         }
         update_record('question_sessions', $session);
     }

diff --git a/question/comment.html b/question/comment.html
index 30a837cdcb5584530b82ce75ff17e097dee0b1ef..00d5d3dd21d057b2f5f60d99692af85b93837dc2 100644 (file)
--- a/question/comment.html
+++ b/question/comment.html
@@ -10,7 +10,7 @@
     </td>
     <td>
       <?php
-        print_textarea($usehtmleditor, 15, 60, 630, 300, $prefix.'[comment]', $state->comment);
+        print_textarea($usehtmleditor, 15, 60, 630, 300, $prefix.'[comment]', stripslashes($state->comment));
       ?>
     </td>
   </tr>