Make sure PivotByDimension respects original segment query parameter when fetching intersected tables by segment.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/DataTable/Filter/PivotByDimension.php b/core/DataTable/Filter/PivotByDimension.php
index 1d0a7267f8..867e3ec04b 100644
--- a/core/DataTable/Filter/PivotByDimension.php
+++ b/core/DataTable/Filter/PivotByDimension.php
@@ -300,6 +300,12 @@ class PivotByDimension extends BaseFilter
     {
         $segmentStr = $this->thisReportDimensionSegment->getSegment() . "==" . urlencode($segmentValue);
 
+        // TODO: segment + report API method query params should be stored in DataTable metadata so we don't have to access it here
+        $originalSegment = Common::getRequestVar('segment', false);
+        if (!empty($originalSegment)) {
+            $segmentStr = $originalSegment . ';' . $segmentStr;
+        }
+
         Log::debug("PivotByDimension: Fetching intersected with segment '%s'", $segmentStr);
 
         $params = array('segment' => $segmentStr) + $this->getRequestParamOverride($table);