MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding

Browse source 
Move suppress_tags config usage to template
This commit is contained in:
Michael Vogel 2018-03-25 22:26:17 +02:00 • committed by GitHub
commit bfc2bda9b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 106 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Object/Post.php
View file

@ -8,6 +8,7 @@ use Friendica\BaseObject;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
@ -337,6 +338,7 @@ class Post extends BaseObject
$tmp_item = [
'template' => $this->getTemplate(),
'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
'suppress_tags' => Config::get('system', 'suppress_tags'),
'tags' => $item['tags'],
'hashtags' => $item['hashtags'],
'mentions' => $item['mentions'],