Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-sorting

Update naturalsort_defaultcollator.php. Fixes #13982

2 files changed, 20 insertions, 3 deletions

diff --git a/lib/private/naturalsort.php b/lib/private/naturalsort.php
index ef242eb7ab9..535e4a7676f 100644
--- a/lib/private/naturalsort.php
+++ b/lib/private/naturalsort.php
@@ -28,6 +28,19 @@ class NaturalSort {
 	private $cache = array();
 
 	/**
+	 * Instantiate a new \OC\NaturalSort instance.
+	 * @param object $injectedCollator
+	 */
+	public function __construct($injectedCollator = null) {
+		// inject an instance of \Collator('en_US') to force using the php5-intl Collator
+		// or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
+		if (isset($injectedCollator)) {
+			$this->collator = $injectedCollator;
+			\OC_Log::write('core', 'forced use of '.get_class($injectedCollator), \OC_Log::DEBUG);
+		}
+	}
+
+	/**
 	 * Split the given string in chunks of numbers and strings
 	 * @param string $t string
 	 * @return array of strings and number chunks
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;
 	}
 }