Merge pull request #2021 from pixelfed/staging

Update PlaceController, fixes #2017
pixelfed · Feb 16, 2020 · dcc504a · dcc504a
2 parents 6f96caf + c78bdad
commit dcc504a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@
 - Updated mail panel blade view, fix markdown bug ([cbc63b04](https://github.com/pixelfed/pixelfed/commit/cbc63b04))
 - Updated self-diagnosis checks ([03f808c7](https://github.com/pixelfed/pixelfed/commit/03f808c7))
 - Updated DiscoverController, fixes #2009 ([b04c7170](https://github.com/pixelfed/pixelfed/commit/b04c7170))
+- Updated DeleteAccountPipeline, fixes [#2016](https://github.com/pixelfed/pixelfed/issues/2016), a bug affecting account deletion.
+- Updated PlaceController, fixes [#2017](https://github.com/pixelfed/pixelfed/issues/2017), a postgres bug affecting country pagination in the places directory ([dd5fa3a4](https://github.com/pixelfed/pixelfed/commit/dd5fa3a4))
 
 ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8)
 ### Added

diff --git a/app/Http/Controllers/PlaceController.php b/app/Http/Controllers/PlaceController.php
@@ -33,7 +33,7 @@ public function directoryHome(Request $request)
 
     public function directoryCities(Request $request, $country)
     {
-        $country = urldecode($country);
+        $country = ucfirst(urldecode($country));
         $places = Place::whereCountry($country)
             ->orderBy('name', 'asc')
             ->distinct('name')