Bug #6293 - Cannot regrade a question when a teacher has added a comm…

…ent with a ' Stupid, wreched, datalib. Why can't datalib take care of addslashes, so the whole of the rest of the code can forget about it? That is how a database abstraction layer should work. I know, it is pointless to moan about it, but it has just cost me 3 hours, so I feel I have earned the right to moan.

lib/questionlib.php

@@ -715,6 +715,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);
     }

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>