diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-06-16 12:53:55 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-06-16 12:53:55 +0100 |
| commit | 85ba39d0fa2bdd8d3be327ba2fda43c897aeaeeb (patch) | |
| tree | b96afc84149b0d5c146647159f711d516c0c641d | |
| parent | 5c073d1cfc71dbac0dbc6c3ea777ebaf3b49a628 (diff) | |
| download | webtrees-85ba39d0fa2bdd8d3be327ba2fda43c897aeaeeb.tar.gz webtrees-85ba39d0fa2bdd8d3be327ba2fda43c897aeaeeb.tar.bz2 webtrees-85ba39d0fa2bdd8d3be327ba2fda43c897aeaeeb.zip | |
Fix: #3333 - use correct collation sequence to sort place names in control panel
| -rw-r--r-- | app/Http/Controllers/Admin/LocationController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php index 6cf6eda0cf..047b99bb30 100644 --- a/app/Http/Controllers/Admin/LocationController.php +++ b/app/Http/Controllers/Admin/LocationController.php @@ -177,7 +177,7 @@ class LocationController extends AbstractAdminController $rows = DB::table('placelocation') ->where('pl_parent_id', '=', $id) - ->orderBy('pl_place') + ->orderBy(new Expression('pl_place /*! COLLATE ' . I18N::collation() . ' */')) ->get(); $list = []; @@ -523,7 +523,7 @@ class LocationController extends AbstractAdminController // Data for the next level. $rows = DB::table('placelocation') ->where('pl_parent_id', '=', $parent_id) - ->orderBy('pl_place') + ->orderBy(new Expression('pl_place /*! COLLATE ' . I18N::collation() . ' */')) ->get(); foreach ($rows as $row) { |