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:
authorStefan Giehl <stefan@matomo.org>2022-11-09 04:44:15 +0300
committerGitHub <noreply@github.com>2022-11-09 04:44:15 +0300
commit57b33215b7c5b455468da65f370fefd2d13beed2 (patch)
tree7bcf0d8906fd47a4e7439f78136a7c3b3fa26d94
parent1ee16ac6bee1e347e3dd0b15b8651448168bc6ff (diff)
Avoid double formatting of conversion rate in comparison mode (#19970)
-rw-r--r--plugins/Goals/Reports/Get.php19
1 files changed, 11 insertions, 8 deletions
diff --git a/plugins/Goals/Reports/Get.php b/plugins/Goals/Reports/Get.php
index 9e73143cea..5a57c1d3d8 100644
--- a/plugins/Goals/Reports/Get.php
+++ b/plugins/Goals/Reports/Get.php
@@ -140,15 +140,18 @@ class Get extends Base
]);
// Adding conversion rate as extra processed metrics ensures it will be formatted
- $view->config->filters[] = function (DataTable $t) {
- $extraProcessedMetrics = $t->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
+ // This is not done when comparing, as comparison does its own formatting
+ if (!$view->isComparing()) {
+ $view->config->filters[] = function (DataTable $t) {
+ $extraProcessedMetrics = $t->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
- if (empty($extraProcessedMetrics)) {
- $extraProcessedMetrics = [];
- }
- $extraProcessedMetrics[] = new ConversionRate();
- $t->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
- };
+ if (empty($extraProcessedMetrics)) {
+ $extraProcessedMetrics = [];
+ }
+ $extraProcessedMetrics[] = new ConversionRate();
+ $t->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
+ };
+ }
$allowMultiple = Common::getRequestVar('allow_multiple', 0, 'int');