Fixed issue #17978: Public stat show all response and not only submit…

…ted (#2389) Dev $query was not initialized. Probably some error while porting.
LimeSurvey · May 20, 2022 · 2d3b176 · 2d3b176
1 parent f6d29c7
commit 2d3b176
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/application/helpers/userstatistics_helper.php b/application/helpers/userstatistics_helper.php
@@ -1449,6 +1449,12 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
         } elseif (incompleteAnsFilterState() == "complete") {
             $criteria->addCondition("submitdate is not null");
         }
+
+        //check for any "sql" that has been passed from another script
+        if (!empty($sql)) {
+            $criteria->addCondition($sql);
+        }
+
         // prepare and decrypt data
         $oResponses = Response::model($surveyid)->findAll($criteria);
         foreach ($oResponses as $key => $oResponse) {
@@ -1565,21 +1571,6 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
                 }
             }
 
-            //check filter option
-            if (incompleteAnsFilterState() == "incomplete") {
-                $query .= " AND submitdate is null";
-            } elseif (incompleteAnsFilterState() == "complete") {
-                $query .= " AND submitdate is not null";
-            }
-
-            //check for any "sql" that has been passed from another script
-            if (!empty($sql)) {
-                $query .= " AND $sql";
-            }
-
-
-            // $statisticsoutput .= "\n<!-- ($sql): $query -->\n\n";
-
             //store temporarily value of answer count of question type '5' and 'A'.
             $tempcount = -1; //count can't be less han zero