harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only cascade privacy warning if thread parent has privacy concerns.

Browse Source
This commit is contained in:
M.Dent 2019-02-13 08:26:03 -05:00
parent 5b3ea012ab
commit c3e2b463e4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Lib/ThreadItem.php
View File

@ -119,14 +119,11 @@ class ThreadItem {
if ($lock) { if ($lock) {
if (($item['mid'] == $item['parent_mid']) && count(get_terms_oftype($item['term'],TERM_FORUM))) { if (($item['mid'] == $item['parent_mid']) && count(get_terms_oftype($item['term'],TERM_FORUM))) {
$privacy_warning = true; $privacy_warning = true;
$conv_flags['parent_privacy_warning'] = true;
} }
} }
if ($privacy_warning) { $privacy_warning = (isset($conv_flags['parent_privacy_warning'])) ? $conv_flags['parent_privacy_warning'] : $privacy_warning;
$conv_flags['privacy_warning'] = $privacy_warning;
} else {
$privacy_warning = (isset($conv_flags['privacy_warning'])) ? $conv_flags['privacy_warning'] : false;
}
if ($lock && $privacy_warning) { if ($lock && $privacy_warning) {
$lock = t('Privacy conflict. Discretion advised.'); $lock = t('Privacy conflict. Discretion advised.');