clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13691 from annando/always-enable-no-sharer 

The option "community_no_sharer" is now always enabled
This commit is contained in:
Hypolite Petovan 2023-12-03 09:14:43 -05:00 committed by GitHub
parent 05ffc8b0d7 6e523beec3
commit f2e90e91e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Conversation/Channel.php
View File

@ -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');
}

2
src/Module/Conversation/Community.php
View File

@ -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');
}

4
static/defaults.config.php
View File

@ -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,