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.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.php')
| -rw-r--r-- | lib/private/naturalsort.php | 13 |
1 files changed, 13 insertions, 0 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 |