From c3e2b463e4604d5bb148ebbaa97b68ca33ce89e1 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Wed, 13 Feb 2019 08:26:03 -0500 Subject: Only cascade privacy warning if thread parent has privacy concerns. --- Zotlabs/Lib/ThreadItem.php | 7 ++----- 1 file 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.'); -- cgit v1.2.3