From 1e1be409b7c27a9f04e52607d7347d05edbfc6c8 Mon Sep 17 00:00:00 2001 From: brumsoel Date: Wed, 8 Oct 2014 22:40:57 +0200 Subject: [PATCH 1/2] Fix timestamp comparator return value --- apps/files/lib/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index e4bfcb4e9ee..6a6db9276a0 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -80,7 +80,7 @@ class Helper public static function compareTimestamp($a, $b) { $aTime = $a->getMTime(); $bTime = $b->getMTime(); - return $aTime - $bTime; + return ($aTime < $bTime) ? -1 : 1; } /** From 0dcfd5f20b86b5c64cac13407a2d83862fcb0a15 Mon Sep 17 00:00:00 2001 From: brumsel Date: Wed, 3 Dec 2014 23:45:57 +0100 Subject: [PATCH 2/2] Modified filesort test cases to test for large sizes & timestamps --- apps/files/tests/helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index da902f4f78a..1b7c8eef43a 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/helper.php @@ -33,10 +33,10 @@ class Test_Files_Helper extends \Test\TestCase { */ private function getTestFileList() { return array( - self::makeFileInfo('a.txt', 4, 1000), + self::makeFileInfo('a.txt', 4, 2.3 * pow(10, 9)), self::makeFileInfo('q.txt', 5, 150), self::makeFileInfo('subdir2', 87, 128, true), - self::makeFileInfo('b.txt', 166, 800), + self::makeFileInfo('b.txt', 2.2 * pow(10, 9), 800), self::makeFileInfo('o.txt', 12, 100), self::makeFileInfo('subdir', 88, 125, true), );