Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-02-10 06:50:49 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-02-10 06:52:09 +0300
commitb02da27e4eb788a9dc820950f6b28bb8dc6b83f9 (patch)
treed9f2ba730d71b3d36e7223d2aa0138b68f9e5b4b /plugins/CoreHome/Columns
parentf5c463e3d7deb1b80aacdc2b7d8c96a0add6897b (diff)
refs #6705 this fixes a couple of tests, especially should we not call mergeChildren as it would change the dataTable
Diffstat (limited to 'plugins/CoreHome/Columns')
-rw-r--r--plugins/CoreHome/Columns/UserId.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
index 4cdc13c5d1..d4c438c47a 100644
--- a/plugins/CoreHome/Columns/UserId.php
+++ b/plugins/CoreHome/Columns/UserId.php
@@ -98,7 +98,11 @@ class UserId extends VisitDimension
public function hasDataTableUsers(DataTable\DataTableInterface $result)
{
if ($result instanceof Map) {
- $result = $result->mergeChildren();
+ foreach ($result->getDataTables() as $table) {
+ if ($this->hasDataTableUsers($table)) {
+ return true;
+ }
+ }
}
if (!$result->getRowsCount()) {