From 6c57470b136b57908915c164a4d124c11eb98cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Fri, 13 May 2022 15:06:23 +0200 Subject: [PATCH] fix: slug generation uses actor locale instead of forum default --- framework/core/src/Discussion/Discussion.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/framework/core/src/Discussion/Discussion.php b/framework/core/src/Discussion/Discussion.php index 5db3bc980..f3ee3d258 100644 --- a/framework/core/src/Discussion/Discussion.php +++ b/framework/core/src/Discussion/Discussion.php @@ -22,6 +22,7 @@ use Flarum\Locale\LocaleManager; use Flarum\Notification\Notification; use Flarum\Post\MergeableInterface; use Flarum\Post\Post; +use Flarum\Settings\SettingsRepositoryInterface; use Flarum\User\User; use Illuminate\Support\Str; @@ -446,6 +447,10 @@ class Discussion extends AbstractModel protected function setTitleAttribute($title) { $this->attributes['title'] = $title; - $this->slug = Str::slug($title, '-', resolve(LocaleManager::class)->getLocale()); + $this->slug = Str::slug( + $title, + '-', + resolve(SettingsRepositoryInterface::class)->get('default_locale', 'en') + ); } }