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:
authordiosmosis <benaka@piwik.pro>2014-11-27 02:06:49 +0300
committerdiosmosis <benaka@piwik.pro>2014-11-27 02:07:11 +0300
commit9c267a22546e474147b7410e4a0a41e14d5342ed (patch)
tree8a86f29fc866cb343a8a79a5324985c10b5c2c50 /core/Plugin/Report.php
parent757d47c08a0b5f51d42748c2b8c6bdd787e6ac7e (diff)
Fix several bugs causing differences in API output w/ master.
Diffstat (limited to 'core/Plugin/Report.php')
-rw-r--r--core/Plugin/Report.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index c5c50bb459..1824b6774f 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -424,7 +424,8 @@ class Report
*/
public function getAllMetrics()
{
- return array_keys(array_merge($this->getMetrics(), $this->getProcessedMetrics()));
+ $processedMetrics = $this->getProcessedMetrics() ?: array();
+ return array_keys(array_merge($this->getMetrics(), $processedMetrics));
}
/**