refs #4633 actually it is not a good idea to generate a segment for subtables since they can belong to different repots and need different segments

3 files changed, 1 insertions, 7 deletions

diff --git a/core/DataTable/Filter/AddSegmentByLabel.php b/core/DataTable/Filter/AddSegmentByLabel.php
index 1b2f5bc9ea..2e9fd693d1 100644
--- a/core/DataTable/Filter/AddSegmentByLabel.php
+++ b/core/DataTable/Filter/AddSegmentByLabel.php
@@ -73,8 +73,6 @@ class AddSegmentByLabel extends BaseFilter
                 if (!empty($label)) {
                     $row->setMetadata('segment', $segment . '==' . urlencode($label));
                 }
-
-                $this->filterSubTable($row);
             }
         } else if (!empty($this->delimiter)) {
             $numSegments  = count($this->segments);
diff --git a/core/DataTable/Filter/AddSegmentByLabelMapping.php b/core/DataTable/Filter/AddSegmentByLabelMapping.php
index 89c48a5741..29fbdceda8 100644
--- a/core/DataTable/Filter/AddSegmentByLabelMapping.php
+++ b/core/DataTable/Filter/AddSegmentByLabelMapping.php
@@ -58,8 +58,6 @@ class AddSegmentByLabelMapping extends BaseFilter
                 $label = $this->mapping[$label];
                 $row->setMetadata('segment', $this->segment . '==' . urlencode($label));
             }
-
-            $this->filterSubTable($row);
         }
     }
 }
diff --git a/core/DataTable/Filter/AddSegmentBySegmentValue.php b/core/DataTable/Filter/AddSegmentBySegmentValue.php
index ba5ed048b7..7417a48c67 100644
--- a/core/DataTable/Filter/AddSegmentBySegmentValue.php
+++ b/core/DataTable/Filter/AddSegmentBySegmentValue.php
@@ -63,7 +63,7 @@ class AddSegmentBySegmentValue extends BaseFilter
         }
 
         /** @var \Piwik\Plugin\Segment $segment */
-        $segment     = array_shift($segments);
+        $segment     = reset($segments);
         $segmentName = $segment->getSegment();
 
         foreach ($table->getRows() as $row) {
@@ -73,8 +73,6 @@ class AddSegmentBySegmentValue extends BaseFilter
             if ($value !== false && $filter === false) {
                 $row->setMetadata('segment', sprintf('%s==%s', $segmentName, urlencode($value)));
             }
-
-            $this->filterSubTable($row);
         }
     }
 }