diff --git a/admin/statistics.php b/admin/statistics.php
index ecc609afb10..d2d62ed6187 100644
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -560,13 +560,14 @@
if (substr($rt, 0, 1) == "M") //MULTIPLE OPTION, THEREFORE MULTIPLE FIELDS.
{
list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)));
- $nquery = "SELECT title, type, question, lid FROM {$dbprefix}questions WHERE qid='$qqid'";
+ $nquery = "SELECT title, type, question, lid, other FROM {$dbprefix}questions WHERE qid='$qqid'";
$nresult = mysql_query($nquery) or die ("Couldn't get question
$nquery
".mysql_error());
while ($nrow=mysql_fetch_row($nresult))
{
$qtitle=$nrow[0]; $qtype=$nrow[1];
$qquestion=strip_tags($nrow[2]);
$qlid=$nrow[3];
+ $qother=$nrow[4];
}
//1. Get list of answers
@@ -577,7 +578,11 @@
$mfield=substr($rt, 1, strlen($rt))."$row[0]";
$alist[]=array("$row[0]", "$row[1]", $mfield);
}
-
+ if ($qother == "Y")
+ {
+ $mfield=substr($rt, 1, strlen($rt))."other";
+ $alist[]=array(_OTHER, _OTHER, $mfield);
+ }
}
elseif (substr($rt, 0, 1) == "R") //RANKING OPTION THEREFORE CONFUSING
{
@@ -873,14 +878,21 @@
{
if ($al[2]) //picks out alist that come from the multiple list above
{
- $query = "SELECT count(`$al[2]`) FROM {$dbprefix}survey_$sid WHERE `$al[2]` =";
- if (substr($rt, 0, 1) == "R")
+ if ($al[1] == _OTHER)
{
- $query .= " '$al[0]'";
+ $query = "SELECT count(`$al[2]`) FROM {$dbprefix}survey_$sid WHERE `$al[2]` != ''";
}
else
{
- $query .= " 'Y'";
+ $query = "SELECT count(`$al[2]`) FROM {$dbprefix}survey_$sid WHERE `$al[2]` =";
+ if (substr($rt, 0, 1) == "R")
+ {
+ $query .= " '$al[0]'";
+ }
+ else
+ {
+ $query .= " 'Y'";
+ }
}
}
else
@@ -890,10 +902,18 @@
if ($sql != "NULL") {$query .= " AND $sql";}
$result=mysql_query($query) or die ("Couldn't do count of values
$query
".mysql_error());
echo "\n\n\n";
+ //echo $qtype;
while ($row=mysql_fetch_row($result))
{
- if ($al[0] == "") {$fname=_NOANSWER;} else {$fname="$al[1] ($al[0])";}
- echo "\t