Index: multichoice.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/quiz/multichoice.module,v
retrieving revision 1.48
diff -u -r1.48 multichoice.module
--- multichoice.module	19 Sep 2007 18:58:08 -0000	1.48
+++ multichoice.module	20 Sep 2007 19:46:07 -0000
@@ -395,7 +395,7 @@
   foreach ($node->answers as $value) {
     if (trim($value['answer']) != "") {
       db_query("INSERT INTO {quiz_multichoice_answers} " .
-               "(answer_id, nid, vid, answer, feedback, points, result_option) VALUES (%d, %d, %d, '%s', '%s', %d, %d)", 
+               "(answer_id, nid, vid, answer, feedback, is_correct, result_option) VALUES (%d, %d, %d, '%s', '%s', %d, %d)", 
                db_next_id('{quiz_multichoice_answers}_answer_id'), $node->nid, $question_vid, $value['answer'], $value['feedback'], $value['correct'], $value['result_option']);
     }
   }
@@ -425,13 +425,13 @@
       } 
       else {
         //Update this entry
-        db_query("UPDATE {quiz_multichoice_answers} SET answer = '%s', feedback = '%s', points = %d, result_option = %d WHERE answer_id = %d", 
+        db_query("UPDATE {quiz_multichoice_answers} SET answer = '%s', feedback = '%s', is_correct = %d, result_option = %d WHERE answer_id = %d", 
           $value['answer'], $value['feedback'], $value['correct'], $value['result_option'], $value['answer_id']);
       }
     } 
     else if (trim($value['answer']) != "") {
       //If there is an answer, insert a new row
-      db_query("INSERT INTO {quiz_multichoice_answers} (answer_id, nid, vid, answer, feedback, points, result_option) " .
+      db_query("INSERT INTO {quiz_multichoice_answers} (answer_id, nid, vid, answer, feedback, is_correct, result_option) " .
                "VALUES(%d, %d, %d, '%s', '%s', %d, %d)", 
                db_next_id('{quiz_multichoice_answers}_answer_id'), $node->nid, $question_vid, $value['answer'], $value['feedback'], $value['correct'], $value['result_option']);
     }
@@ -618,7 +618,7 @@
  */
 function multichoice_calculate_result($nid, $vid, $tried) {
   $answers = db_query("SELECT answer_id FROM {quiz_multichoice_answers} " .
-                      "WHERE nid = %d AND vid = %d AND points = 1", $nid, $vid);
+                      "WHERE nid = %d AND vid = %d AND is_correct = 1", $nid, $vid);
   
   while ($answer = db_fetch_array($answers)) {
     $correct_answers[] = $answer['answer_id'];
Index: quiz.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/quiz/quiz.module,v
retrieving revision 1.105
diff -u -r1.105 quiz.module
--- quiz.module	20 Sep 2007 17:41:31 -0000	1.105
+++ quiz.module	20 Sep 2007 19:46:09 -0000
@@ -1052,12 +1052,12 @@
   }
 
   // if we are using pass / fail and they passed
-  if (trim($quiz->summary_pass) != '' && $quiz->pass_rate > 0 && $score['percentage_score'] >= $quiz->pass_rate) {
+  if ($quiz->pass_rate > 0 && $score['percentage_score'] >= $quiz->pass_rate) {
     // If we are coming from the admin view page
     if ($admin) {
       $summary = t('The user passed this quiz.');      
     }
-    else {
+    else if(trim($quiz->summary_pass) != ''){
       $summary = (!empty($score_result)) ? $score_result : check_markup($quiz->summary_pass, $quiz->format);
     }
   } 
@@ -1070,7 +1070,7 @@
         $summary = t('The user failed this quiz.');
       }
     }
-    else {
+    else if(trim($quiz->summary_pass) != ''){
       $summary = (!empty($score_result)) ? $score_result : check_markup($quiz->summary_default, $quiz->format);
     }
   }