Avoid loading goals data multiple times (#19838)

1 files changed, 13 insertions, 6 deletions

diff --git a/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php b/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php
index ad20a36b0a..8ee83ce4b4 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php
@@ -71,7 +71,9 @@ abstract class GoalSpecificProcessedMetric extends ProcessedMetric
         }
     }
 
-    protected function getGoalName()
+    protected static $goalsCache = [];
+
+    protected function getGoalName(): string
     {
         if ($this->idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
             return Piwik::translate('Goals_EcommerceOrder');
@@ -80,15 +82,20 @@ abstract class GoalSpecificProcessedMetric extends ProcessedMetric
         }
 
         if (isset($this->idSite)) {
-            $allGoals = Request::processRequest('Goals.getGoals', ['idSite' => $this->idSite, 'filter_limit' => '-1'], $default = []);
-            $goalName = @$allGoals[$this->idGoal]['name'];
-            return $goalName;
+            if (!isset(self::$goalsCache[$this->idSite])) {
+                self::$goalsCache[$this->idSite] = Request::processRequest(
+                    'Goals.getGoals',
+                    ['idSite' => $this->idSite, 'filter_limit' => '-1'],
+                    $default = []
+                );
+            }
+            return self::$goalsCache[$this->idSite][$this->idGoal]['name'] ?? '';
         } else {
-            return "";
+            return '';
         }
     }
 
-    protected function getGoalNameForDocs()
+    protected function getGoalNameForDocs(): string
     {
         $goalName = $this->getGoalName();
         if ($goalName == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {