From b04c7170d76e620eb9e7426f7b2b6772a8a3c499 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 14 Feb 2020 22:11:42 -0700 Subject: [PATCH 1/2] Update DiscoverController, fixes #2009 --- app/Http/Controllers/DiscoverController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 92d488386..fd90d2284 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -42,7 +42,9 @@ class DiscoverController extends Controller { abort_if(!config('instance.discover.tags.is_public') && !Auth::check(), 403); - $tag = Hashtag::whereSlug($hashtag)->firstOrFail(); + $tag = Hashtag::whereName($hashtag) + ->orWhere('slug', $hashtag) + ->firstOrFail(); $tagCount = StatusHashtagService::count($tag->id); return view('discover.tags.show', compact('tag', 'tagCount')); } From a68e1a42ed048818817407de221e66564282b160 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 14 Feb 2020 22:12:40 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88df28cc7..25b3a6715 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Updated robots.txt ([25101901](https://github.com/pixelfed/pixelfed/commit/25101901)) - 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)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added