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
path: root/core
diff options
context:
space:
mode:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-13 03:10:55 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-13 03:10:55 +0400
commita5a1d4f1e067b2806f04cbab4c4eb7e988db719b (patch)
treeb95fac7d162ae5daa8e217cb9cbe3959b419c8e3 /core
parent91ea06716a7ba1250099686c2cdb824da526de56 (diff)
Fix regression causing un-flatten option to not be shown (custom parameters have lower priority than existing query parameters).
Diffstat (limited to 'core')
-rw-r--r--core/ViewDataTable.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index 14208e63ed..7700de9dcf 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -805,6 +805,10 @@ abstract class Piwik_ViewDataTable
}
}
}
+
+ foreach ($this->viewProperties['custom_parameters'] as $name => $value) {
+ $javascriptVariablesToSet[$name] = $value;
+ }
foreach ($_GET as $name => $value) {
try {
@@ -826,10 +830,6 @@ abstract class Piwik_ViewDataTable
$javascriptVariablesToSet[$name] = $this->viewProperties[$name];
}
}
-
- foreach ($this->viewProperties['custom_parameters'] as $name => $value) {
- $javascriptVariablesToSet[$name] = $value;
- }
if ($this->dataTable instanceof Piwik_DataTable) {
// we override the filter_sort_column with the column used for sorting,