always fetch all possible dimensions

matomo-org · Jun 9, 2017 · a26ec64 · a26ec64
1 parent db295e7
commit a26ec64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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)