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@googlemail.com>2014-09-03 10:36:22 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-09-03 11:20:11 +0400
commit53470bede98bb2897fe164f6297ec97bf7b286b3 (patch)
tree09abe19465d1505567460cc519d8030797846029
parent6cd5530fbbbf39321c168545ee2bd053ddcc7ca9 (diff)
refs #6102 make sure processedMetrics is an array to prevent any notice
-rw-r--r--plugins/API/ProcessedReport.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index ee6f9618f6..e174d3e4a4 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -498,13 +498,15 @@ class ProcessedReport
$columns
);
- if (isset($reportMetadata['processedMetrics'])) {
+ if (isset($reportMetadata['processedMetrics']) && is_array($reportMetadata['processedMetrics'])) {
$processedMetricsAdded = Metrics::getDefaultProcessedMetrics();
foreach ($reportMetadata['processedMetrics'] as $processedMetricId => $processedMetricTranslation) {
// this processed metric can be displayed for this report
+
if ($processedMetricTranslation && $processedMetricId !== $processedMetricTranslation) {
$columns[$processedMetricId] = $processedMetricTranslation;
} elseif (isset($processedMetricsAdded[$processedMetricId])) {
+ // for instance in case 'nb_visits' => 'nb_visits' we will translate it
$columns[$processedMetricId] = $processedMetricsAdded[$processedMetricId];
}
}