Index: multichoice.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/quiz/multichoice.module,v
retrieving revision 1.34
diff -u -r1.34 multichoice.module
--- multichoice.module	19 Oct 2006 17:26:30 -0000	1.34
+++ multichoice.module	22 Oct 2006 23:32:39 -0000
@@ -297,17 +297,20 @@
       unset($node->answers[$key]);
     }
     else {
-      $options[$key] = $answer['answer'];
+      $options[$key] = check_markup($answer['answer'], $node->filter);
     }
   }
   
-  $form['question'] = array('#type' => 'markup', '#value' => $node->body);
+  $form['start'] = array('#type' => 'markup', '#value' => '<div class="multichoice_form">');
+  $form['question'] = array('#type' => 'markup', '#value' => check_markup($node->body, $node->format));
   
   // Create form
   $form['tries'] = array(
+    '#prefix' => '<div class="multichoice_answer">',
     '#type' => $type,
     '#options' => $options,
     '#default_value' => -1,
+    '#suffix' => '</div>',
   );
   $form['submit'] = array(
     '#type' => 'submit',
Index: quiz.css
===================================================================
RCS file: /cvs/drupal/contributions/modules/quiz/quiz.css,v
retrieving revision 1.2
diff -u -r1.2 quiz.css
--- quiz.css	19 Oct 2006 17:17:38 -0000	1.2
+++ quiz.css	22 Oct 2006 23:32:39 -0000
@@ -7,6 +7,9 @@
   font-style: italic;
   font-size: 80%;
 }
+.multichoice_answer p  {
+  display: inline;
+}
 
 /*
 ** Definitions that apply on the summary pages
Index: quiz.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/quiz/quiz.module,v
retrieving revision 1.80
diff -u -r1.80 quiz.module
--- quiz.module	22 Oct 2006 20:24:34 -0000	1.80
+++ quiz.module	22 Oct 2006 23:32:40 -0000
@@ -494,10 +494,10 @@
     t('Do not show')
   );
   $feedback = $feedback_options[$node->feedback_time];
-  $takes = $node->takes == 0 ? t('Unlimited') : "$node->takes minutes";
+  $takes = $node->takes == 0 ? t('Unlimited') : check_plain($node->takes);
   $rows = array();
   $rows[] = array(
-    $node->number_of_questions,
+    check_plain($node->number_of_questions),
     $shuffle,
     $backwards,
     $feedback,
@@ -528,7 +528,7 @@
     $output .= '<h3>'. t('Taxonomy selection') .'</h3>';
     $terms = array();
     foreach(taxonomy_node_get_terms($node->nid) as $term) {
-      $terms[] = $term->name;
+      $terms[] = check_plain($term->name);
     }
     if (!empty($terms)) {
       $terms = implode(', ', $terms);
@@ -670,11 +670,9 @@
 
       }
     }
-    else {
-      drupal_not_found();
-    }
-    return $node->body;
   }
+  // If we got down here then the quiz does not exist.
+  drupal_not_found();
 }
 
 
@@ -1550,8 +1548,8 @@
   while(list($key, $result) = each($results)) {
     $rows[] = array(
       l("view", "admin/quiz/".$result['rid']."/view") . " | " . l("delete", "admin/quiz/".$result['rid']."/delete"),
-      $result['title'],
-      $result['name'],
+      check_plain($result['title']),
+      check_plain($result['name']),
       $result['rid'],
       format_date($result['time_start'], 'small'),
       ($result['time_end'] > 0) ? format_date($result['time_end'], 'small') : t('In Progress'),
@@ -1590,8 +1588,8 @@
   while(list($key, $result) = each($results)) {
     $rows[] = array(
       l("view", "user/quiz/".$result['rid']."/userresults"),
-      $result['title'],
-      $result['name'],
+      check_plain($result['title']),
+      check_plain($result['name']),
       $result['rid'],
       format_date($result['time_start'], 'small'),
       ($result['time_end'] > 0) ? format_date($result['time_end'], 'small') : t('In Progress'),
@@ -1658,7 +1656,7 @@
   while(list($key, $question) = each($questions)) {
     $rows[] = array(
       $status_descriptions[$question->status],
-      $question->question,
+      check_markup($question->question),
       $question->type);
   }
   $header = array(t('Status'), t('Question'), t('Type'));
@@ -1882,7 +1880,7 @@
     }
 
     // Add the cell with the question and the answers
-    $q_output = '<div class="quiz_summary_question"><span class="quiz_question_bullet">Q:</span> '. $question['question']. '</div>';
+    $q_output = '<div class="quiz_summary_question"><span class="quiz_question_bullet">Q:</span> '. check_markup($question['question']) .'</div>';
     $q_output .= theme('table', $innerHeader, $result['resultstable']).'<br />';
     $cols[] = array('data' => $q_output, 'class'=> 'quiz_summary_qcell');