Merge pull request #4662 from rahulshukla-webkul/development

Issue #4659 fixed
This commit is contained in:
Glenn Hermans 2021-02-19 15:48:48 +01:00 committed by GitHub
commit d43b60e014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions

View File

@ -239,13 +239,7 @@ class Core
*/
public function getChannelName($channel): string
{
static $channelName;
if ($channelName) {
return $channelName;
}
return $channelName = $channel->name
return $channel->name
?? $channel->translate(app()->getLocale())->name
?? $channel->translate(config('app.fallback_locale'))->name;
}