diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-02-25 10:30:14 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-02-25 10:30:14 +0100 |
| commit | fb87b746f0255ad7e2e01eaecd1ed6def9bf3c94 (patch) | |
| tree | b9653c3ec5ea235e70b33a66b00707db40d322f4 /lib/private/naturalsort_defaultcollator.php | |
| parent | 7e7e0c51fb97312c69ee0cf03e9241f1bf08294e (diff) | |
| parent | 0066c6f00136989eadfc7471a4e9a3a3ad73ffc1 (diff) | |
| download | nextcloud-server-fb87b746f0255ad7e2e01eaecd1ed6def9bf3c94.tar.gz nextcloud-server-fb87b746f0255ad7e2e01eaecd1ed6def9bf3c94.zip | |
Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-sorting
Update naturalsort_defaultcollator.php. Fixes #13982
Diffstat (limited to 'lib/private/naturalsort_defaultcollator.php')
| -rw-r--r-- | lib/private/naturalsort_defaultcollator.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/naturalsort_defaultcollator.php b/lib/private/naturalsort_defaultcollator.php index f777cfd794f..94db6dfbae5 100644 --- a/lib/private/naturalsort_defaultcollator.php +++ b/lib/private/naturalsort_defaultcollator.php @@ -22,9 +22,13 @@ namespace OC; class NaturalSort_DefaultCollator { public function compare($a, $b) { - if ($a === $b) { - return 0; + $result = strcasecmp($a, $b); + if ($result === 0) { + if ($a === $b) { + return 0; + } + return ($a > $b) ? -1 : 1; } - return ($a < $b) ? -1 : 1; + return ($result < 0) ? -1 : 1; } } |