From 7d173091c94213489a2d89d09d77603dcfeb40ff Mon Sep 17 00:00:00 2001 From: sheck87 <5990151+sheck87@users.noreply.github.com> Date: Mon, 24 Jan 2022 23:14:51 +0300 Subject: [PATCH 1/5] Sorting assets alphabetically --- modules/cms/widgets/AssetList.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 6c61fea939..3e3452d72a 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -534,6 +534,9 @@ protected function getDirectoryContents($dir) ]; } } + + usort($result, function($a, $b) {return strcmp($a->name, $b->name);}); + usort($files, function($a, $b) {return strcmp($a->name, $b->name);}); foreach ($files as $file) { $result[] = $file; From a41d9ad25f6effd6bb1a0e6f98879dffaaf76a07 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 24 Jan 2022 14:48:46 -0600 Subject: [PATCH 2/5] Update modules/cms/widgets/AssetList.php --- modules/cms/widgets/AssetList.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 3e3452d72a..52aa9acf48 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -535,8 +535,9 @@ protected function getDirectoryContents($dir) } } - usort($result, function($a, $b) {return strcmp($a->name, $b->name);}); - usort($files, function($a, $b) {return strcmp($a->name, $b->name);}); + // Sort directories & files in alphabetical order + usort($result, function($a, $b) { return strcmp($a->name, $b->name); }); + usort($files, function($a, $b) { return strcmp($a->name, $b->name); }); foreach ($files as $file) { $result[] = $file; From 6c19494ad5385fe8ca85de11d2adc001be149bbe Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 24 Jan 2022 14:52:43 -0600 Subject: [PATCH 3/5] Code style tweaks --- modules/cms/widgets/AssetList.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 52aa9acf48..3c0b36775c 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -534,10 +534,10 @@ protected function getDirectoryContents($dir) ]; } } - - // Sort directories & files in alphabetical order - usort($result, function($a, $b) { return strcmp($a->name, $b->name); }); - usort($files, function($a, $b) { return strcmp($a->name, $b->name); }); + + // Sort directories & files in alphabetical order + usort($result, function($a, $b) { return strcmp($a->name, $b->name); }); + usort($files, function($a, $b) { return strcmp($a->name, $b->name); }); foreach ($files as $file) { $result[] = $file; From 4c752dd5017f005f02f61818fb2ff7c3501faa94 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Tue, 25 Jan 2022 18:27:04 -0600 Subject: [PATCH 4/5] Update modules/cms/widgets/AssetList.php --- modules/cms/widgets/AssetList.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 3c0b36775c..846d4098f7 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -536,8 +536,11 @@ protected function getDirectoryContents($dir) } // Sort directories & files in alphabetical order - usort($result, function($a, $b) { return strcmp($a->name, $b->name); }); - usort($files, function($a, $b) { return strcmp($a->name, $b->name); }); + $sortByName = function ($a, $b) { + return strcmp($a->name, $b->name); + }); + usort($result, $sortByName); + usort($files, $sortByName); foreach ($files as $file) { $result[] = $file; From 1fadce45678824cf5630ffa7b3ddcd4c748dca58 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Tue, 25 Jan 2022 18:29:28 -0600 Subject: [PATCH 5/5] Update modules/cms/widgets/AssetList.php --- modules/cms/widgets/AssetList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 846d4098f7..c80520b33e 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -538,7 +538,7 @@ protected function getDirectoryContents($dir) // Sort directories & files in alphabetical order $sortByName = function ($a, $b) { return strcmp($a->name, $b->name); - }); + }; usort($result, $sortByName); usort($files, $sortByName);