Separate checking for empty site from checking whether we should do e… (#14538)

* Separate checking for empty site from checking whether we should do empty site check.

* Apply pr review

1 files changed, 12 insertions, 2 deletions

diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index cb7fe68547..6f019dfddb 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -65,6 +65,11 @@ class SitesManager extends \Piwik\Plugin
             return;
         }
 
+        $shouldPerformEmptySiteCheck = self::shouldPerormEmptySiteCheck($siteId);
+        if (!$shouldPerformEmptySiteCheck) {
+            return;
+        }
+
         $hadTrafficKey = 'SitesManagerHadTrafficInPast_' . (int) $siteId;
         $hadTrafficBefore = Option::get($hadTrafficKey);
         if (!empty($hadTrafficBefore)) {
@@ -89,6 +94,12 @@ class SitesManager extends \Piwik\Plugin
 
     public static function hasTrackedAnyTraffic($siteId)
     {
+        $trackerModel = new TrackerModel();
+        return !$trackerModel->isSiteEmpty($siteId);
+    }
+
+    public static function shouldPerormEmptySiteCheck($siteId)
+    {
         $shouldPerformEmptySiteCheck = true;
 
         /**
@@ -102,8 +113,7 @@ class SitesManager extends \Piwik\Plugin
          */
         Piwik::postEvent('SitesManager.shouldPerformEmptySiteCheck', [&$shouldPerformEmptySiteCheck, $siteId]);
 
-        $trackerModel = new TrackerModel();
-        return $shouldPerformEmptySiteCheck && !$trackerModel->isSiteEmpty($siteId);
+        return $shouldPerformEmptySiteCheck;
     }
 
     public function onSiteDeleted($idSite)