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

Merge branch 'patch-20190130a' into 'dev'

Browse Source 
Set lock red and provide warning  if a forum is tagged in the post

See merge request hubzilla/core!1499
This commit is contained in:
Mario 2019-02-01 09:29:59 +01:00
commit f30bb452cc
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/ThreadItem.php
View File

@ -101,6 +101,7 @@ class ThreadItem {
|| strlen($item['deny_cid']) || strlen($item['deny_gid'])))) || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
? t('Private Message') ? t('Private Message')
: false); : false);
$shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && ($item['item_private'] != 1)) ? true : 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 // allow an exemption for sharing stuff from your private feeds
@ -115,6 +116,16 @@ class ThreadItem {
$privacy_warning = true; $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(); $mode = $conv->get_mode();
switch($item['item_type']) { switch($item['item_type']) {