--- ./quiz.module.before	2006-10-20 03:18:10.000000000 +0200
+++ ./quiz.module.now	2006-10-20 04:52:07.000000000 +0200
@@ -266,7 +266,7 @@
  *   Returns the number of quiz questions.
  */
 function quiz_get_number_of_questions($nid) {
-  $result = db_fetch_object(db_query('SELECT number_of_questions FROM quiz WHERE nid = %d', $nid));  
+  $result = db_fetch_object(db_query('SELECT number_of_questions FROM {quiz} WHERE nid = %d', $nid));  
   $numberOfQuestions = $result->number_of_questions;
   return $numberOfQuestions;
 }
@@ -279,7 +279,7 @@
  *   Returns the pass rate of quiz.
  */
 function quiz_get_pass_rate($nid) {
-    $passrate = db_fetch_object(db_query('SELECT pass_rate FROM quiz WHERE nid = %d', $nid));
+    $passrate = db_fetch_object(db_query('SELECT pass_rate FROM {quiz} WHERE nid = %d', $nid));
     return $passrate->pass_rate;   
 }
 
@@ -1354,7 +1354,7 @@
  */
 function quiz_user_results() {
   $questions = _quiz_get_answers(arg(2));
-  $result = db_fetch_object(db_query('SELECT quiz.nid FROM quiz, quiz_result WHERE quiz_result.quiz_nid = quiz.nid AND quiz_result.rid = %d', arg(2)));
+  $result = db_fetch_object(db_query('SELECT q.nid FROM {quiz} q, {quiz_result} qr WHERE qr.quiz_nid = q.nid AND qr.rid = %d', arg(2)));
   return _quiz_get_results_table($questions, $result->nid, FALSE);
 }
 
@@ -1363,7 +1363,7 @@
  */
 function quiz_admin_results() {
   $questions = _quiz_get_answers(arg(2));
-  $result = db_fetch_object(db_query('SELECT quiz.nid FROM quiz, quiz_result WHERE quiz_result.quiz_nid = quiz.nid AND quiz_result.rid = %d', arg(2)));
+  $result = db_fetch_object(db_query('SELECT q.nid FROM {quiz} q, {quiz_result} qr WHERE qr.quiz_nid = q.nid AND qr.rid = %d', arg(2)));
   return _quiz_get_results_table($questions, $result->nid);
 }
 
@@ -1521,7 +1521,7 @@
                           qqr.answer qanswer,
                           nr.body question,
                           n.type type
-                        FROM quiz_question_results qqr, quiz_question qq, node n, node_revisions nr
+                        FROM {quiz_question_results} qqr, {quiz_question} qq, {node} n, {node_revisions} nr
                         WHERE
                           qqr.result_rid = %d
                             AND