[Stack-cvs] stack-1-0 quiz.php,1.41,1.42 user.php,1.10,1.11

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21996

Modified Files:
	quiz.php user.php 
Log Message:


Index: quiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/quiz.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** quiz.php	15 Sep 2005 12:08:53 -0000	1.41
--- quiz.php	19 Sep 2005 08:23:22 -0000	1.42
***************
*** 77,81 ****
    //                           This prevents further attempts
    // action = review           Review a student's quiz, as the teacher.
!                                
   
    // If there is a quiz stored in the $_SESSION, we should use this.
--- 77,87 ----
    //                           This prevents further attempts
    // action = review           Review a student's quiz, as the teacher.
! 
! 
!   if ('new_quiz_version' == $action or 'review' == $action) {
!       // Clear any existing quiz and quizInst from the $_SESSION
!       session_unregister('quizInst'); 
!       session_unregister('quiz');
!   }                               
   
    // If there is a quiz stored in the $_SESSION, we should use this.
***************
*** 83,89 ****
    if (array_key_exists('quiz',$_SESSION)) {
        $quiz   = $_SESSION['quiz'];
!   } else {
!       $action = 'continue_quiz';
!   }
   
    ////////////////////////////////////////////////
--- 89,93 ----
    if (array_key_exists('quiz',$_SESSION)) {
        $quiz   = $_SESSION['quiz'];
!   } 
   
    ////////////////////////////////////////////////
***************
*** 115,121 ****
    // (4.3) construct the $quiz  
    if ('continue_quiz' == $action or 'new_quiz_version' == $action or 'review' == $action) {
-       // Clear any existing quiz and quizInst from the $_SESSION
-       session_unregister('quizInst'); 
-       session_unregister('quiz');
    
        if (array_key_exists('quizid',$_POST)) {
--- 119,122 ----

Index: user.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/user.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** user.php	13 Sep 2005 08:48:10 -0000	1.10
--- user.php	19 Sep 2005 08:23:22 -0000	1.11
***************
*** 87,90 ****
--- 87,91 ----
          $subject_store = stack_zone_subjects_order($subject_store); 
  
+         $returnurl = '';
          include($stack_root.'/html/quizchoose.html');