From a26ec642a3eb544c7bdfbd02e79c43c0eb4ed168 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Fri, 9 Jun 2017 17:54:23 +0200
Subject: [PATCH] always fetch all possible dimensions

---
 CustomDimensions.php | 14 ++++++--------
 VisitorDetails.php   |  8 ++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CustomDimensions.php b/CustomDimensions.php
index 1d01b6c..8088ad6 100644
--- a/CustomDimensions.php
+++ b/CustomDimensions.php
@@ -304,16 +304,14 @@ public function addVisitFieldsToPersist(&$fields)
         }
     }
 
-    public function provideActionDimensionFields(&$fields, &$joins, $idSite)
+    public function provideActionDimensionFields(&$fields, &$joins)
     {
-        $configuration = new Dao\Configuration();
-        $dimensions    = $configuration->getCustomDimensionsHavingScope($idSite, CustomDimensions::SCOPE_ACTION);
+        $logTable = new Dao\LogTable(CustomDimensions::SCOPE_ACTION);
+        $indices = $logTable->getInstalledIndexes();
 
-        foreach ($dimensions as $dimension) {
-            if ($dimension['active'] && $dimension['scope'] === CustomDimensions::SCOPE_ACTION) {
-                $field    = Dao\LogTable::buildCustomDimensionColumnName($dimension);
-                $fields[] = $field;
-            }
+        foreach ($indices as $index) {
+            $field    = Dao\LogTable::buildCustomDimensionColumnName($index);
+            $fields[] = $field;
         }
     }
 
diff --git a/VisitorDetails.php b/VisitorDetails.php
index 500877f..34ae1dc 100644
--- a/VisitorDetails.php
+++ b/VisitorDetails.php
@@ -61,6 +61,14 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
             }
             unset($action[$field]);
         }
+
+        $logTable = new Dao\LogTable(CustomDimensions::SCOPE_ACTION);
+        $indices = $logTable->getInstalledIndexes();
+
+        foreach ($indices as $index) {
+            $field    = Dao\LogTable::buildCustomDimensionColumnName($index);
+            unset($action[$field]);
+        }
     }
 
     public function renderVisitorDetails($visitorDetails)