diff options
| author | M.Dent <dentm42@dm42.net> | 2019-02-13 08:26:03 -0500 |
|---|---|---|
| committer | M.Dent <dentm42@dm42.net> | 2019-02-13 08:26:03 -0500 |
| commit | c3e2b463e4604d5bb148ebbaa97b68ca33ce89e1 (patch) | |
| tree | 93a58c95e07826516db690966acef1c58e5dcaad | |
| parent | 5b3ea012ab0712cd6f02fe9cb07e75f2c4b5954a (diff) | |
| download | volse-hubzilla-c3e2b463e4604d5bb148ebbaa97b68ca33ce89e1.tar.gz volse-hubzilla-c3e2b463e4604d5bb148ebbaa97b68ca33ce89e1.tar.bz2 volse-hubzilla-c3e2b463e4604d5bb148ebbaa97b68ca33ce89e1.zip | |
Only cascade privacy warning if thread parent has privacy concerns.
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 323f84acf..04265ee5a 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -119,14 +119,11 @@ class ThreadItem { if ($lock) { if (($item['mid'] == $item['parent_mid']) && count(get_terms_oftype($item['term'],TERM_FORUM))) { $privacy_warning = true; + $conv_flags['parent_privacy_warning'] = true; } } - if ($privacy_warning) { - $conv_flags['privacy_warning'] = $privacy_warning; - } else { - $privacy_warning = (isset($conv_flags['privacy_warning'])) ? $conv_flags['privacy_warning'] : false; - } + $privacy_warning = (isset($conv_flags['parent_privacy_warning'])) ? $conv_flags['parent_privacy_warning'] : $privacy_warning; if ($lock && $privacy_warning) { $lock = t('Privacy conflict. Discretion advised.'); |