Small bugfixes ... (yawn)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 09963d828e7a06697c9a9348fafc0189eae2bc4c..18123dac3b70794b220070c82ca07e4245937cdb 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -120,15 +120,7 @@
     }
 
     if ($cat) { //-----------------------------------------------------------
-        if ($catshow) {
-            $modform->category = $cat;
-        } else if ($catrename) {
-            redirect("category.php?rename=$cat");
-        } else if ($catdelete) {
-            redirect("category.php?delete=$cat");
-        } else if ($catnew) {
-            redirect("category.php?new=$cat");
-        }
+        $modform->category = $cat;
     }
 
     $modform->sumgrades = 0;

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index acb2191ddb5c52ad846cdcbb00605090ed4e9692..bb1c0b7978272eb3e722eb334ee2a4547979fd7d 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -358,7 +358,7 @@ function quiz_print_category_form($course, $current) {
     echo "<FORM METHOD=POST ACTION=edit.php>"; 
     echo "<B>$strcategory:</B>&nbsp;";
     choose_from_menu($categories, "cat", "$current");
-    echo "<INPUT TYPE=submit NAME=catshow VALUE=\"$strshow\">";
+    echo "<INPUT TYPE=submit VALUE=\"$strshow\">";
     echo "</FORM>";
     echo "</TD><TD align=right>";
     echo "<FORM METHOD=GET ACTION=category.php>"; 
@@ -373,7 +373,7 @@ function quiz_get_all_question_grades($questionlist, $quizid) {
 // Given a list of question IDs, finds grades or invents them to 
 // create an array of matching grades
 
-    $questions = get_records_sql("SELECT * FROM quiz_question_grades 
+    $questions = get_records_sql("SELECT question,grade FROM quiz_question_grades 
                                   WHERE quiz = '$quizid' 
                                     AND question IN ($questionlist)");