From 0839f2e5e10dfb9908491f6bbf5bb3eaf9bb49b2 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Wed, 30 Sep 2015 22:31:02 +0200
Subject: [PATCH] fixes #8866 - avoid notices in UserCountryMap controller
---
plugins/UserCountryMap/Controller.php | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index ccd1a8c5e6..e333e80c4a 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -247,14 +247,18 @@ class Controller extends \Piwik\Plugin\Controller
$metaData = unserialize($request->process());
$metrics = array();
- foreach ($metaData[0]['metrics'] as $id => $val) {
- // todo: should use SettingsPiwik::isUniqueVisitorsEnabled ?
- if (Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') {
- $metrics[] = array($id, $val);
+ if (!empty($metaData[0]['metrics']) && is_array($metaData[0]['metrics'])) {
+ foreach ($metaData[0]['metrics'] as $id => $val) {
+ // todo: should use SettingsPiwik::isUniqueVisitorsEnabled ?
+ if (Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') {
+ $metrics[] = array($id, $val);
+ }
}
}
- foreach ($metaData[0]['processedMetrics'] as $id => $val) {
- $metrics[] = array($id, $val);
+ if (!empty($metaData[0]['processedMetrics']) && is_array($metaData[0]['processedMetrics'])) {
+ foreach ($metaData[0]['processedMetrics'] as $id => $val) {
+ $metrics[] = array($id, $val);
+ }
}
return $metrics;
}
--
GitLab