factoring out the shouldArchive logic

1 files changed, 6 insertions, 12 deletions

diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 313632e411..d0c0b9d759 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -148,15 +148,12 @@ class Piwik_CustomVariables extends Piwik_Plugin
      */
     public function archiveDay($notification)
     {
-        /** @var Piwik_ArchiveProcessing_Day $archiveProcessing */
         $archiveProcessing = $notification->getNotificationObject();
 
-        if (!$archiveProcessing->shouldProcessReportsForPlugin($this->getPluginName())) {
-            return;
-        }
-
         $archiving = new Piwik_CustomVariables_Archiver($archiveProcessing);
-        $archiving->archiveDay();
+        if($archiving->shouldArchive()) {
+            $archiving->archiveDay();
+        }
     }
 
     /**
@@ -165,13 +162,10 @@ class Piwik_CustomVariables extends Piwik_Plugin
     function archivePeriod($notification)
     {
         $archiveProcessing = $notification->getNotificationObject();
-
-        if (!$archiveProcessing->shouldProcessReportsForPlugin($this->getPluginName())) {
-            return;
-        }
-
         $archiving = new Piwik_CustomVariables_Archiver($archiveProcessing);
-        $archiving->archivePeriod();
+        if($archiving->shouldArchive()) {
+            $archiving->archivePeriod();
+        }
     }
 
 }