strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix disabled content filter for own posts

Browse source
This commit is contained in:
Hypolite Petovan 2018-04-01 15:15:05 -04:00
parent f26c99d17b
commit d38b86dabf
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/text.php
View file

@ -1270,7 +1270,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
// Compile eventual content filter reasons // Compile eventual content filter reasons
$filter_reasons = []; $filter_reasons = [];
if (!$is_preview && !$item['self']) { if (!$is_preview && !($item['self'] && local_user() == $item['uid'])) {
if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'social', 'disable_cw', false))) { if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'social', 'disable_cw', false))) {
$filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']); $filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']);
} }
@ -1305,9 +1305,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
$s = $hook_data['html']; $s = $hook_data['html'];
unset($hook_data); unset($hook_data);
if (!$is_preview && !$item['self']) {
$s = apply_content_filter($s, $filter_reasons); $s = apply_content_filter($s, $filter_reasons);
}
if (! $attach) { if (! $attach) {
// Replace the blockquotes with quotes that are used in mails. // Replace the blockquotes with quotes that are used in mails.