Merge branch 'master' into 7181_isolated_archive_purging

Conflicts:
	core/ArchiveProcessor/Rules.php

1 files changed, 1 insertions, 13 deletions

diff --git a/core/Archive/Parameters.php b/core/Archive/Parameters.php
index d1a540dce0..ad7bef9eb6 100644
--- a/core/Archive/Parameters.php
+++ b/core/Archive/Parameters.php
@@ -35,22 +35,16 @@ class Parameters
      */
     private $segment;
 
-    /**
-     * @var bool
-     */
-    private $skipAggregationOfSubTables;
-
     public function getSegment()
     {
         return $this->segment;
     }
 
-    public function __construct($idSites, $periods, Segment $segment, $skipAggregationOfSubTables)
+    public function __construct($idSites, $periods, Segment $segment)
     {
         $this->idSites = $idSites;
         $this->periods = $periods;
         $this->segment = $segment;
-        $this->skipAggregationOfSubTables = $skipAggregationOfSubTables;
     }
 
     public function getPeriods()
@@ -62,11 +56,5 @@ class Parameters
     {
         return $this->idSites;
     }
-
-    public function isSkipAggregationOfSubTables()
-    {
-        return $this->skipAggregationOfSubTables;
-    }
-
 }