Fixed mandatory conditional question bug that had arisen with 0.98rc6

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@878 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 31, 2004 · 6ab1262 · 6ab1262
1 parent ffb688b
commit 6ab1262
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/question.php b/question.php
@@ -132,9 +132,10 @@
 			{
 			$dccm="display".$cmfns[0];
 			}
-		if ((isset($_POST[$dccm]) && $_POST[$dccm] == "on") && (!isset($_SESSION[$ccm]) || $_SESSION[$ccm] != "0") && (!isset($_POST[$multiname]) || !$_POST[$multiname]))
+		if ((isset($_POST[$dccm]) && $_POST[$dccm] == "on") && !isset($_SESSION[$ccm]) && (!isset($_POST[$multiname]) || !$_POST[$multiname]))
 			{
 			//One of the conditional mandatory questions was on, but hasn't been answered
+			//echo "Got here -".$_POST[$dccm]."-".$_SESSION[$ccm]; exit;
 			if (isset($_POST['move']) && $_POST['move'] == " << "._PREV." ") {$_SESSION['step'] = $_POST['thisstep'];}
 			if (isset($_POST['move']) && $_POST['move'] == " "._NEXT." >> ") {$_SESSION['step'] = $_POST['thisstep'];}
 			if (isset($_POST['move']) && $_POST['move'] == " "._LAST." ") {$_SESSION['step'] = $_POST['thisstep']; $_POST['move'] == " "._NEXT." >> ";}
@@ -731,7 +732,6 @@
 $percentcomplete = makegraph($_SESSION['step'], $_SESSION['totalsteps']);
 
 //READ TEMPLATES, INSERT DATA AND PRESENT PAGE
-echo "<html>\n";
 foreach(file("$thistpl/startpage.pstpl") as $op)
 	{
 	echo templatereplace($op);