refs matomo-org#4706 fix sort test

sabl0r · May 13, 2014 · bbe0304 · bbe0304
1 parent c334dcd
commit bbe0304
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
@@ -74,6 +74,14 @@ public function numberSort($a, $b)
         $valA = $a->getColumn($this->columnToSort);
         $valB = $b->getColumn($this->columnToSort);
 
+        if ($valA === false) {
+            $valA = null;
+        }
+
+        if ($valB === false) {
+            $valB = null;
+        }
+
         return !isset($valA)
         && !isset($valB)
             ? 0
@@ -111,6 +119,14 @@ function naturalSort($a, $b)
         $valA = $a->getColumn($this->columnToSort);
         $valB = $b->getColumn($this->columnToSort);
 
+        if ($valA === false) {
+            $valA = null;
+        }
+
+        if ($valB === false) {
+            $valB = null;
+        }
+
         return !isset($valA)
         && !isset($valB)
             ? 0
@@ -138,6 +154,14 @@ function sortString($a, $b)
         $valA = $a->getColumn($this->columnToSort);
         $valB = $b->getColumn($this->columnToSort);
 
+        if ($valA === false) {
+            $valA = null;
+        }
+
+        if ($valB === false) {
+            $valB = null;
+        }
+
         return !isset($valA)
         && !isset($valB)
             ? 0
@@ -224,6 +248,7 @@ public function filter($table)
                 $methodToUse = "sortString";
             }
         }
+
         $table->sort(array($this, $methodToUse), $this->columnToSort);
     }
 }