refs #4633 actually it is not a good idea to generate a segment for s…

…ubtables since they can belong to different repots and need different segments
matomo-org · Feb 15, 2015 · c20303e · c20303e
1 parent 03551a1
commit c20303e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/core/DataTable/Filter/AddSegmentByLabel.php b/core/DataTable/Filter/AddSegmentByLabel.php
@@ -73,8 +73,6 @@ public function filter($table)
                 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
@@ -58,8 +58,6 @@ public function filter($table)
                 $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
@@ -63,7 +63,7 @@ public function filter($table)
         }
 
         /** @var \Piwik\Plugin\Segment $segment */
-        $segment     = array_shift($segments);
+        $segment     = reset($segments);
         $segmentName = $segment->getSegment();
 
         foreach ($table->getRows() as $row) {
@@ -73,8 +73,6 @@ public function filter($table)
             if ($value !== false && $filter === false) {
                 $row->setMetadata('segment', sprintf('%s==%s', $segmentName, urlencode($value)));
             }
-
-            $this->filterSubTable($row);
         }
     }
 }