From 173059f6d00faa06dab9188efb2d7536f15861e4 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 18 Feb 2014 12:29:05 +0100 Subject: Fixed file list sorting Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare() --- apps/files/lib/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files/lib') diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 50b4e8338a8..d857c1df154 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -66,7 +66,7 @@ class Helper } elseif ($aType !== 'dir' and $bType === 'dir') { return 1; } else { - return strnatcasecmp($a->getName(), $b->getName()); + return \OCP\Util::naturalSortCompare($a->getName(), $b->getName()); } } -- cgit v1.2.3