From 6e523beec317e1732c4dc399b9561ec1f3ebe2e5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 3 Dec 2023 10:26:58 +0000 Subject: [PATCH] The option "community_no_sharer" is now always enabled --- src/Module/Conversation/Channel.php | 2 +- src/Module/Conversation/Community.php | 2 +- static/defaults.config.php | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index e841eaa277..d2453b410a 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -115,7 +115,7 @@ class Channel extends Timeline $this->page['aside'] .= Widget::accountTypes('channel/' . $this->selectedTab, $this->accountTypeString); - if (!in_array($this->selectedTab, [ChannelEntity::FOLLOWERS, ChannelEntity::FORYOU]) && $this->config->get('system', 'community_no_sharer')) { + if (!in_array($this->selectedTab, [ChannelEntity::FOLLOWERS, ChannelEntity::FORYOU])) { $this->page['aside'] .= $this->getNoSharerWidget('channel'); } diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 117a18da37..6fec4cc94d 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -106,7 +106,7 @@ class Community extends Timeline $this->page['aside'] .= Widget::accountTypes('community/' . $this->selectedTab, $this->accountTypeString); - if ($this->session->getLocalUserId() && $this->config->get('system', 'community_no_sharer')) { + if ($this->session->getLocalUserId()) { $this->page['aside'] .= $this->getNoSharerWidget('community'); } diff --git a/static/defaults.config.php b/static/defaults.config.php index e7bc123501..841a9c2c30 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -148,10 +148,6 @@ return [ // Comma separated list of hashtags that shouldn't be displayed in the trending tags 'blocked_tags' => '', - // community_no_sharer (Boolean) - // Don't display sharing accounts on the global community - 'community_no_sharer' => false, - // contact_update_limit (Integer) // How many contacts should be checked at a time? 'contact_update_limit' => 100,