Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git

LimeSurvey · Nov 30, 2012 · 6284ca6 · 6284ca6
2 parents b1ffaa9 + 0bca7c2
commit 6284ca6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -591,7 +591,8 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
         $fieldmap=createFieldMap($surveyid, "full", false, false, $language);
         $sDatabaseType = Yii::app()->db->getDriverName();
         $statisticsoutput="";
-
+        $qqid = "";
+
         /* Some variable depend on output type, actually : only line feed */
         switch($outputType)
         {
@@ -1570,7 +1571,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
 
         }
 
-        return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype, "statisticsoutput"=>$statisticsoutput);
+        return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype, "statisticsoutput"=>$statisticsoutput, "parentqid"=>$qqid);
     }
 
     /**
@@ -2875,7 +2876,7 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
         //-------------------------- PCHART OUTPUT ----------------------------
         list($qsid, $qgid, $qqid) = explode("X", $rt, 3);
         $qsid = $surveyid;
-        $aattr = getQuestionAttributeValues($qqid, substr($rt, 0, 1));
+        $aattr = getQuestionAttributeValues($outputs['parentqid'], substr($rt, 0, 1));
 
         //PCHART has to be enabled and we need some data
         if ($usegraph == 1) {