diff options
| author | zotlabs <mike@macgirvin.com> | 2019-02-07 19:54:07 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-02-07 19:54:07 -0800 |
| commit | 4837f9cdad47b6709b8b5cefac821d28435d6783 (patch) | |
| tree | a423148e097d1f9b651730876342b8916ae0c350 /Zotlabs/Lib | |
| parent | 317c53acf6b74a4f92284074017985fb09662a46 (diff) | |
| parent | 2b7a60522394d87eb3362829497e7a1a2542ca55 (diff) | |
| download | volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.tar.gz volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.tar.bz2 volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 94d0e3cf8..bdbfc4385 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']) { @@ -418,9 +429,9 @@ class ThreadItem { 'rawmid' => $item['mid'], 'plink' => get_plink($item), 'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), - 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''), + 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts') && ($item['item_type'] == ITEM_TYPE_POST)) ? $star : ''), 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''), - 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), + 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing') && ($item['item_type'] == ITEM_TYPE_POST)) ? $filer : ''), 'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''), 'addtocal' => (($has_event) ? t('Add to Calendar') : ''), 'drop' => $drop, |