From f0b2c1cc2b67f412ac61aeb9bb3fcfcfc294da8e Mon Sep 17 00:00:00 2001
From: gustav_delius <gustav_delius>
Date: Wed, 15 Feb 2006 08:59:32 +0000
Subject: [PATCH] Applied fixes from bug 4319. Thanks to Jaroslav

---
 mod/quiz/db/mysql.php | 1 +
 mod/quiz/locallib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php
index 4860a0ea4ea..857a4d72e33 100644
--- a/mod/quiz/db/mysql.php
+++ b/mod/quiz/db/mysql.php
@@ -666,6 +666,7 @@ function quiz_upgrade($oldversion) {
                     $multianswers[$i]->length = 0;
                     $multianswers[$i]->questiontext = '';
                     $multianswers[$i]->stamp = make_unique_id_code();
+                    $multianswers[$i]->name = addslashes($multianswers[$i]->name);
                     // $multianswers[$i]->parent is set in the query
                     // $multianswers[$i]->defaultgrade is set in the query
                     // $multianswers[$i]->qtype is set in the query
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 4851f0352aa..1fe6ee32e68 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -474,7 +474,7 @@ function quiz_upgrade_states($attempt) {
     // used by a RANDOM question
     $newest->attemptid = $attempt->uniqueid;
     $questionlist = quiz_questions_in_quiz($attempt->layout);
-    if ($states = get_records_select('quiz_states', "attempt = '$attempt->uniqueid' AND question IN ($questionlist)")) {
+    if ($questionlist and $states = get_records_select('quiz_states', "attempt = '$attempt->uniqueid' AND question IN ($questionlist)")) {
         foreach ($states as $state) {
             $session->newgraded = $state->id;
             $session->newest = $state->id;