Fixed bug #835: "No answer" condition doesn't work if depending on Li…

…st(Radio) question - 2nd try git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2830 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 1, 2007 · 4229077 · 4229077
1 parent 064e288
commit 4229077
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/admin/conditions.php b/admin/conditions.php
@@ -328,7 +328,7 @@
 					}
 					break;
 				}
-				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['code'], "", $clang->gT("No answer"));
+				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['code'], " ", $clang->gT("No answer"));
 			}
 		}
 		elseif ($rows['type'] == "R")
@@ -350,7 +350,7 @@
 				{
 					$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$i, $qck[0], $qck[1]);
 				}
-				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$i, "", $clang->gT("No answer"));
+				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$i, " ", $clang->gT("No answer"));
 			}
 			unset($quicky);
 		}
@@ -362,19 +362,19 @@
 				case "Y":
 				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "Y", $clang->gT("Yes"));
 				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "N", $clang->gT("No"));
-				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", $clang->gT("No answer"));
+				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], " ", $clang->gT("No answer"));
 				break;
 				case "G":
 				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "F", $clang->gT("Female"));
 				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "M", $clang->gT("Male"));
-				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", $clang->gT("No answer"));
+				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], " ", $clang->gT("No answer"));
 				break;
 				case "5":
 				for ($i=1; $i<=5; $i++)
 				{
 					$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], $i, $i);
 				}
-				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", $clang->gT("No answer"));
+				$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], " ", $clang->gT("No answer"));
 				break;
 				case "W":
 				case "Z":
@@ -401,7 +401,7 @@
 				if ($rows['type'] != "M" && $rows['type'] != "P" && $rows['type'] != "J" && $rows['type'] != "I")
 
 				{
-					$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], "", $clang->gT("No answer"));
+					$canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], " ", $clang->gT("No answer"));
 				}
 				break;
 			}

diff --git a/qanda.php b/qanda.php
@@ -837,7 +837,7 @@ function do_list_radio($ia)
 	if ($ia[6] != "Y" && $shownoanswer == 1)
 	{
 		$rowcounter++;
-		$answer .= "\t\t\t\t\t\t  <input class='radio' type='radio' name='$ia[1]' id='answer$ia[1]NANS' value='' ";
+		$answer .= "\t\t\t\t\t\t  <input class='radio' type='radio' name='$ia[1]' id='answer$ia[1]NANS' value=' ' ";
 		if (((!isset($_SESSION[$ia[1]]) || $_SESSION[$ia[1]] == "") && (!isset($defexists) || !$defexists)) || ($_SESSION[$ia[1]] == ' ' && (!isset($defexists) || !$defexists)))
 		{
 			$answer .= " checked"; //Check the "no answer" radio button if there is no default, and user hasn't answered this.
@@ -949,7 +949,7 @@ function do_list_flexible_radio($ia)
 	if ($ia[6] != "Y" && $shownoanswer == 1)
 	{
 		$rowcounter++;
-		$answer .= "\t\t\t\t\t\t  <input class='radio' type='radio' name='$ia[1]' id='answer$ia[1]NANS' value='' ";
+		$answer .= "\t\t\t\t\t\t  <input class='radio' type='radio' name='$ia[1]' id='answer$ia[1]NANS' value=' ' ";
 		if ((!isset($defexists) || $defexists != "Y") && (!isset($_SESSION[$ia[1]]) || $_SESSION[$ia[1]] == ""))
 		{
 			$answer .= " checked"; //Check the "no answer" radio button if there is no default, and user hasn't answered this.