Merge branch 'master' into processed_metrics_metadata

Conflicts:
	core/DataTable/Filter/CalculateEvolutionFilter.php
	plugins/UserSettings/API.php

3 files changed, 8 insertions, 4 deletions

diff --git a/core/DataTable/Filter/CalculateEvolutionFilter.php b/core/DataTable/Filter/CalculateEvolutionFilter.php
index 6ca7e551de..acde0643c4 100755
--- a/core/DataTable/Filter/CalculateEvolutionFilter.php
+++ b/core/DataTable/Filter/CalculateEvolutionFilter.php
@@ -114,4 +114,4 @@ class CalculateEvolutionFilter extends ColumnCallbackAddColumnPercentage
         $evolution = round($evolution, $quotientPrecision);
         return $evolution;
     }
-}
\ No newline at end of file
+}
diff --git a/core/DataTable/Filter/RangeCheck.php b/core/DataTable/Filter/RangeCheck.php
index 19dad66cb4..ab144e6b4a 100644
--- a/core/DataTable/Filter/RangeCheck.php
+++ b/core/DataTable/Filter/RangeCheck.php
@@ -32,7 +32,7 @@ class RangeCheck extends BaseFilter
 
         $this->columnToFilter = $columnToFilter;
 
-        if ($minimumValue < $maximumValue) {
+        if ((float) $minimumValue < (float) $maximumValue) {
             self::$minimumValue = $minimumValue;
             self::$maximumValue = $maximumValue;
         }
@@ -48,9 +48,9 @@ class RangeCheck extends BaseFilter
         foreach ($table->getRows() as $row) {
             $value = $row->getColumn($this->columnToFilter);
             if ($value !== false) {
-                if ($value < self::$minimumValue) {
+                if ($value < (float) self::$minimumValue) {
                     $row->setColumn($this->columnToFilter, self::$minimumValue);
-                } elseif ($value > self::$maximumValue) {
+                } elseif ($value > (float) self::$maximumValue) {
                     $row->setColumn($this->columnToFilter, self::$maximumValue);
                 }
             }
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 120fc37760..df0cf7509e 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -69,6 +69,10 @@ class Truncate extends BaseFilter
      */
     public function filter($table)
     {
+        if ($this->truncateAfter < 0) {
+            return;
+        }
+
         $this->addSummaryRow($table);
         $table->queueFilter('ReplaceSummaryRowLabel', array($this->labelSummaryRow));