Merge branch 'master' into 2.x-twig

Conflicts:
	plugins/CoreHome/templates/donate.tpl

2 files changed, 8 insertions, 0 deletions

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 49a6c4d883..e438b96b2f 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -215,6 +215,11 @@ class Piwik_UserSettings_API
 
             $visitsSum = $visitsSumTotal - $ieVisits;
 
+
+            // When Truncate filter is applied, it will call AddSummaryRow which tries to sum all rows.
+            // We tell the object to skip the column nb_visits_percentage when aggregating (since it's not correct to sum % values)
+            $table->setColumnAggregationOperation('nb_visits_percentage', 'skip');
+
             // The filter must be applied now so that the new column can
             // be sorted by the generic filters (applied right after this loop exits)
             $table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Piwik_Archive::INDEX_NB_VISITS, $visitsSum, 1));
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 6e5db05428..e1c5579608 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -16,6 +16,9 @@ require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php';
 
 function Piwik_getPluginsLogo($oldLabel)
 {
+    if($oldLabel == Piwik_Translate('General_Others')) {
+        return false;
+    }
     return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif';
 }