From 9274189f25ce7d39e8550caaa93269a740e4b607 Mon Sep 17 00:00:00 2001
From: gustav_delius <gustav_delius>
Date: Mon, 7 Mar 2005 19:45:39 +0000
Subject: [PATCH] small fix to the versioning code

---
 mod/quiz/edit.php     | 4 ++--
 mod/quiz/locallib.php | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 441a51683ab..61ac31dbb57 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -328,7 +328,7 @@
         }
         notify("$strattemptsexist<br /><a href=\"report.php?id=$cm->id\">$strviewallanswers ($usercount $strusers)</a>");
 
-        $sumgrades = quiz_print_question_list($modform->questions, $modform->grades, false);
+        $sumgrades = quiz_print_question_list($modform->questions, $modform->grades, false, $modform->instance);
         if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $modform->instance)) {
             error('Failed to set sumgrades');
         }
@@ -357,7 +357,7 @@
         echo '<tr><td width="50%" valign="top">';
         print_simple_box_start("center", "100%");
         print_heading($modform->name);
-        $sumgrades = quiz_print_question_list($modform->questions, $modform->grades);
+        $sumgrades = quiz_print_question_list($modform->questions, $modform->grades, true, $modform->instance);
         if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $modform->instance)) {
             error('Failed to set sumgrades');
         }
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index c9b0dc6e2c7..c43e830fe30 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1217,7 +1217,7 @@ function quiz_gradesmenu_options($defaultgrade) {
     return $gradesmenu;
 }
 
-function quiz_print_question_list($questionlist, $grades, $allowdelete=true) {
+function quiz_print_question_list($questionlist, $grades, $allowdelete=true, $quizid=0) {
 // Prints a list of quiz questions in a small layout form with knobs
 // returns sum of maximum grades
 // $questionlist is comma-separated list
@@ -1295,9 +1295,10 @@ function quiz_print_question_list($questionlist, $grades, $allowdelete=true) {
         echo '<td align="center">';
 
         if ($canedit) {
+            $context = $quizid ? '&amp;contextquiz='.$quizid : '';
             echo "<a title=\"$strpreview\" href=\"javascript:void();\" onClick=\"openpopup('/mod/quiz/preview.php?id=$qnum','$strpreview','scrollbars=yes,resizable=yes,width=700,height=480', false)\">
                   <img src=\"../../pix/t/preview.gif\" border=\"0\" alt=\"$strpreview\" /></a>&nbsp;";
-            echo "<a title=\"$stredit\" href=\"question.php?id=$qnum\">
+            echo "<a title=\"$stredit\" href=\"question.php?id=$qnum$context\">
                   <img src=\"../../pix/t/edit.gif\" border=\"0\" alt=\"$stredit\" /></a>&nbsp;";
             if ($allowdelete) {
                 echo "<a title=\"$strremove\" href=\"edit.php?delete=$qnum&amp;sesskey=$USER->sesskey\">
@@ -2006,7 +2007,7 @@ function quizzes_question_used($id) {
 
 function quiz_parse_fieldname($name, $nameprefix='question') {
     $reg = array();
-    if(preg_match("/q(\\d+)(\w+)/", $name, $reg)) {
+    if (preg_match("/$nameprefix(\\d+)(\w+)/", $name, $reg)) {
         return array('mode' => $reg[2], 'id' => (int)$reg[1]);
     } else {
         return false;