diff options
| author | Mario <mario@mariovavti.com> | 2019-02-01 09:29:59 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-02-01 09:29:59 +0100 |
| commit | f30bb452cc39134026d0b6f4b37bda4a5b980b01 (patch) | |
| tree | 553490fc7ce2fedba660e54b32ce3b3b0eaf7a1a | |
| parent | 76582a60b561d037c3f7016dbb3f05fb48429aff (diff) | |
| parent | ad4dd2def58999c58fc12def0e6b5789597f5581 (diff) | |
| download | volse-hubzilla-f30bb452cc39134026d0b6f4b37bda4a5b980b01.tar.gz volse-hubzilla-f30bb452cc39134026d0b6f4b37bda4a5b980b01.tar.bz2 volse-hubzilla-f30bb452cc39134026d0b6f4b37bda4a5b980b01.zip | |
Merge branch 'patch-20190130a' into 'dev'
Set lock red and provide warning if a forum is tagged in the post
See merge request hubzilla/core!1499
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index dc84df316..7ce0d0f9e 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -101,6 +101,7 @@ class ThreadItem { || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? t('Private Message') : false); + $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && ($item['item_private'] != 1)) ? true : false); // allow an exemption for sharing stuff from your private feeds @@ -115,6 +116,16 @@ class ThreadItem { $privacy_warning = true; } + if ($lock) { + if (count(get_terms_oftype($item['term'],TERM_FORUM))) { + $privacy_warning = true; + } + } + + if ($lock && $privacy_warning) { + $lock = t('Privacy conflict. Discretion advised.'); + } + $mode = $conv->get_mode(); switch($item['item_type']) { |