fix goals

Author: sgiehl

plugins/Goals/DataTable/Filter/CalculateConversionPageRate.php

@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\Goals\DataTable\Filter;
 
+use Piwik\Context;
 use Piwik\Plugins\Goals\Archiver as GoalsArchiver;
 use Piwik\Archive;
 use Piwik\DataTable\BaseFilter;
@@ -79,16 +80,16 @@ public function filter($table)
      */
     private function getGoalTotalConversions(DataTable $table, array $goalIds): array
     {
-        $goalTotals = [];
+
 
         if (empty($goalIds)) {
-            return $goalTotals;
+            return [];
         }
 
-        /** @var Site $site */
+        /** @var Site|false $site */
         $site = $table->getMetadata('site');
         if (empty($site)) {
-            return $goalTotals;
+            return [];
         }
         $idSite = $site->getId();
 
@@ -97,19 +98,26 @@ private function getGoalTotalConversions(DataTable $table, array $goalIds): arra
         $date = $period->getDateStart()->toString();
         $date = ($periodName === 'range' ? $date . ',' . $period->getDateEnd()->toString() : $date);
         $segment = $table->getMetadata('segment');
-        $archive = Archive::build($idSite, $periodName, $date, $segment);
 
         $names = [];
         foreach ($goalIds as $idGoal => $g) {
             $names[$idGoal] = GoalsArchiver::getRecordName('nb_conversions', $idGoal);
         }
 
-        $sum = $archive->getNumeric($names);
+        $sum = Context::executeWithQueryParameters(['requestedReport' => ''], function () use ($idSite, $periodName, $date, $segment, $names) {
+            $archive = Archive::build($idSite, $periodName, $date, $segment);
+            return $archive->getNumeric($names);
+        });
+
+        if (count($names) === 1) {
+            return [key($names) => $sum];
+        }
+
+        $goalTotals = [];
+
         foreach ($names as $idGoal => $name) {
-            if (is_array($sum) && array_key_exists($name, $sum) && is_numeric($sum[$name])) {
+            if (array_key_exists($name, $sum) && is_numeric($sum[$name])) {
                 $goalTotals[$idGoal] = $sum[$name];
-            } elseif (is_numeric($sum)) {
-                $goalTotals[$idGoal] = $sum;
             }
         }