diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-05-24 05:35:50 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-05-24 05:35:50 -0400 |
| commit | fc6b337bbbd2fd3b5412c8b957122830f73feb2d (patch) | |
| tree | e8417e561ac7445a4018c0cf3bf722779493c430 /Zotlabs/Lib | |
| parent | 40d99c171678654817e392b7f59050dccce770a8 (diff) | |
| parent | 9cf8931136c703c66d0bf83e4c6b8fb7f4d2cf0b (diff) | |
| download | volse-hubzilla-fc6b337bbbd2fd3b5412c8b957122830f73feb2d.tar.gz volse-hubzilla-fc6b337bbbd2fd3b5412c8b957122830f73feb2d.tar.bz2 volse-hubzilla-fc6b337bbbd2fd3b5412c8b957122830f73feb2d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 24cb4a626..2dded1aaa 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -45,6 +45,8 @@ class Apps { } } + call_hooks('get_system_apps',$ret); + return $ret; } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index c7a2c9373..0fed78158 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -102,6 +102,9 @@ class ThreadItem { if($item['author']['xchan_network'] === 'rss') $shareable = true; + $privacy_warning = false; + if($item['owner']['xchan_network'] === 'activitypub') + $privacy_warning = true; $mode = $conv->get_mode(); @@ -370,6 +373,7 @@ class ThreadItem { 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, + 'privacy_warning' => $privacy_warning, 'verified' => $verified, 'unverified' => $unverified, 'forged' => $forged, |