diff options
author | diosmosis <benaka@piwik.pro> | 2014-09-21 22:48:13 +0400 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-09-21 22:48:13 +0400 |
commit | a79da2c519c20bb603a6d97e6fa2d3e0c471540f (patch) | |
tree | 95b90b7546679ae05b2c19de2cf11eda752fca44 /core/DataTable/Filter/PivotByDimension.php | |
parent | 44a99bde692f06c7333c5e06cbd0436f39b4534a (diff) |
Refs #6078, fix column ordering bug, if 0 is used as pivotted table column, it is ordered first and not prepended.
Diffstat (limited to 'core/DataTable/Filter/PivotByDimension.php')
-rw-r--r-- | core/DataTable/Filter/PivotByDimension.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/DataTable/Filter/PivotByDimension.php b/core/DataTable/Filter/PivotByDimension.php index 225a33f0bb..2f4e733ea0 100644 --- a/core/DataTable/Filter/PivotByDimension.php +++ b/core/DataTable/Filter/PivotByDimension.php @@ -452,7 +452,7 @@ class PivotByDimension extends BaseFilter $columnSet = array_map(function () { return false; }, $columnSet); // make sure label column is first - $columnSet = array_merge(array('label' => false), $columnSet); + $columnSet = array('label' => false) + $columnSet; return $columnSet; } @@ -466,8 +466,8 @@ class PivotByDimension extends BaseFilter $currentIndex = 1; foreach ($defaultRow as $columnName => $ignore) { - if ($columnName == $othersRowLabel - || $columnName == 'label' + if ($columnName === $othersRowLabel + || $columnName === 'label' ) { $result[] = $columnName; } else { |