Improve performance of BulkTracking and QueuedTracking

1 files changed, 2 insertions, 7 deletions

diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php
index feacc90e55..5c80aa6349 100644
--- a/plugins/Referrers/Columns/Base.php
+++ b/plugins/Referrers/Columns/Base.php
@@ -70,7 +70,7 @@ abstract class Base extends VisitDimension
     {
         $cacheKey = $referrerUrl . $currentUrl . $idSite;
 
-        if (array_key_exists($cacheKey, self::$cachedReferrer)) {
+        if (isset(self::$cachedReferrer[$cacheKey])) {
             return self::$cachedReferrer[$cacheKey];
         }
 
@@ -108,9 +108,7 @@ abstract class Base extends VisitDimension
             }
         }
 
-        if (!empty($this->referrerHost)
-            && !$referrerDetected
-        ) {
+        if (!$referrerDetected && !empty($this->referrerHost)) {
             $this->typeReferrerAnalyzed = Common::REFERRER_TYPE_WEBSITE;
             $this->nameReferrerAnalyzed = Common::mb_strtolower($this->referrerHost);
         }
@@ -345,7 +343,6 @@ abstract class Base extends VisitDimension
         $type    = $visitor->getVisitorColumn('referer_type');
         $name    = $visitor->getVisitorColumn('referer_name');
         $keyword = $visitor->getVisitorColumn('referer_keyword');
-        $time    = $visitor->getVisitorColumn('visit_first_action_time');
 
         // 0) In some (unknown!?) cases the campaign is not found in the attribution cookie, but the URL ref was found.
         //    In this case we look up if the current visit is credited to a campaign and will credit this campaign rather than the URL ref (since campaigns have higher priority)
@@ -359,7 +356,6 @@ abstract class Base extends VisitDimension
             $type    = Common::REFERRER_TYPE_CAMPAIGN;
             $name    = $referrerCampaignName;
             $keyword = $referrerCampaignKeyword;
-            $time    = $referrerTimestamp;
         } // 2) Referrer URL parsing
         elseif (!empty($referrerUrl)) {
 
@@ -371,7 +367,6 @@ abstract class Base extends VisitDimension
                 $type    = $referrer['referer_type'];
                 $name    = $referrer['referer_name'];
                 $keyword = $referrer['referer_keyword'];
-                $time    = $referrerTimestamp;
             }
         }