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:
authorbenakamoorthi <benaka.moorthi@gmail.com>2012-11-21 11:23:34 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2012-11-21 11:23:34 +0400
commit706f6d647ac56e6d105d2fadf0358dbbc6544158 (patch)
tree5c2aaf7170944357efa62ad515ce1a3834fce8f9 /core/Archive
parente31919a4ea1fc1f7387d653e8452431a5efbe23b (diff)
Fixes #3440, make sure Actions metrics are associated w/ an Actions report in Piwik_Archive_Single::getRequestedReportFor and make sure Piwik_VisitsSummary_Controller::getVisitsSummary can handle case where Piwik_API_Request returns false.
git-svn-id: http://dev.piwik.org/svn/trunk@7500 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Archive')
-rw-r--r--core/Archive/Single.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/Archive/Single.php b/core/Archive/Single.php
index 87b17688a8..74c64218ce 100644
--- a/core/Archive/Single.php
+++ b/core/Archive/Single.php
@@ -593,7 +593,13 @@ class Piwik_Archive_Single extends Piwik_Archive
{
return 'Goals_Metrics';
}
- return $metric;
+ // Actions metrics are processed by the Actions plugin (HACK) (3RD HACK IN FACT) (YES, THIS IS TOO MUCH HACKING)
+ // (FIXME PLEASE).
+ if (in_array($metric, Piwik_Archive::$actionsMetrics))
+ {
+ return 'Actions_Metrics';
+ }
+ return $metric;
}
/**