diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-20 13:14:26 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-20 13:14:26 +0300 |
commit | a25aba2ae5c1833e5b28f1e1025f559a36d4b52f (patch) | |
tree | 8f25a5ead3487eeca94c5671bd3043077ecbd121 /plugins/Events/Events.php | |
parent | 7bf1caf6115cac81ad66ba6d7cf30ecd4fc831f2 (diff) | |
parent | 4575b8b0098554f18f1895e1c164a365d8c23222 (diff) |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/CoreHome/javascripts/menu.js
plugins/Events/Reports/GetActionFromCategoryId.php
plugins/Events/Reports/GetActionFromNameId.php
plugins/Events/Reports/GetCategoryFromActionId.php
plugins/Events/Reports/GetCategoryFromNameId.php
plugins/Events/Reports/GetNameFromActionId.php
plugins/Events/Reports/GetNameFromCategoryId.php
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/Events/Events.php')
-rw-r--r-- | plugins/Events/Events.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php index f09e1a9925..d18bb32f05 100644 --- a/plugins/Events/Events.php +++ b/plugins/Events/Events.php @@ -198,13 +198,16 @@ class Events extends \Piwik\Plugin } - private function addTooltipEventValue($view) + private function addTooltipEventValue(ViewDataTable $view) { // Creates the tooltip message for Event Value column $tooltipCallback = function ($hits, $min, $max, $avg) { if (!$hits) { return false; } + + $avg = $avg ?: 0; + $msgEventMinMax = Piwik::translate("Events_EventValueTooltip", array($hits, "<br />", $min, $max)); $msgEventAvg = Piwik::translate("Events_AvgEventValue", $avg); return $msgEventMinMax . "<br/>" . $msgEventAvg; |