aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-14 20:47:11 -0700
committerzotlabs <mike@macgirvin.com>2018-03-14 20:47:11 -0700
commita94a28bb7e2df6e8438deed9f0fb0e22682e61cc (patch)
tree2474be2f8d94074c252c4205662c38252aad5dec
parent7b56fdebacda402512fc19c040d1355a6558a3aa (diff)
downloadvolse-hubzilla-a94a28bb7e2df6e8438deed9f0fb0e22682e61cc.tar.gz
volse-hubzilla-a94a28bb7e2df6e8438deed9f0fb0e22682e61cc.tar.bz2
volse-hubzilla-a94a28bb7e2df6e8438deed9f0fb0e22682e61cc.zip
mastodon content-warning cont: only strip nsfw tag if a content warning spoiler is used. Else it's legitimately nsfw.
-rw-r--r--include/feedutils.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/feedutils.php b/include/feedutils.php
index 4864a6ef5..62e1299a4 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -673,7 +673,7 @@ function get_atom_elements($feed, $item) {
// construct so the post will already be collapsed. The generated tag is almost
// always wrong and even if it isn't we would already be doing the right thing.
- if($mastodon && $termterm === 'nsfw')
+ if($mastodon && $termterm === 'nsfw' && $summary && $res['body'])
continue;
if($termterm) {