The option "community_no_sharer" is now always enabled

diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php
index e841eaa277e33a501335e68105d988f1d2d70f78..d2453b410abfc22e652e378f9286d75c7e12d388 100644 (file)
--- 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 117a18da37cec7c5e4aaf2b54fa9f57fb9ef773b..6fec4cc94d78292a864deb9ec130f6de7e79976c 100644 (file)
--- 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 e7bc1235016f49714af1a86a8e3924a6dccb7064..841a9c2c30319906a2b92227ac59952d7f84549f 100644 (file)
--- 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,