Modified to allow selection of "No answer" as a condition, but not fo…

…r Multiple Choice, or multiple choice with comment type questions.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@906 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/conditions.php

@@ -60,7 +60,7 @@
 //ADD NEW ENTRY IF THIS IS AN ADD
 if (isset($_POST['action']) && $_POST['action'] == "insertcondition")
 	{
-	if (!$_POST['canswers'] || !$_POST['cquestions'])
+	if (!isset($_POST['canswers']) || !isset($_POST['cquestions']))
 		{
 		echo "<script type=\"text/javascript\">\n<!--\n alert(\"Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer.\")\n //-->\n</script>\n";				
 		}
@@ -239,7 +239,10 @@
 						$theanswer = addcslashes($arows['answer'], "'");
 						$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], $arows['code'], $theanswer);
 						}
-					$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", "No Answer");
+					if ($rows['type'] != "M" && $rows['type'] != "P")
+						{
+						$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", "No Answer");
+						}
 					break;
 				}
 			}