diff options
author | marijus <mario@mariovavti.com> | 2014-08-20 08:05:40 +0200 |
---|---|---|
committer | marijus <mario@mariovavti.com> | 2014-08-20 08:05:40 +0200 |
commit | 85ef5c10333ce4ce9d7e2d4b17caa4b1e7c871ef (patch) | |
tree | 6069ad32f80b130bcf6a19b5950626dd0110b2c3 /mod | |
parent | 0542125711440c008a1e4b77d5edb63c975968f3 (diff) | |
parent | 0fef39a3265602905d1f629c1209e8279c54f0d9 (diff) | |
download | volse-hubzilla-85ef5c10333ce4ce9d7e2d4b17caa4b1e7c871ef.tar.gz volse-hubzilla-85ef5c10333ce4ce9d7e2d4b17caa4b1e7c871ef.tar.bz2 volse-hubzilla-85ef5c10333ce4ce9d7e2d4b17caa4b1e7c871ef.zip |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod')
-rw-r--r-- | mod/lockview.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mod/lockview.php b/mod/lockview.php index 7d39f9e2f..6673ae709 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -33,7 +33,13 @@ function lockview_content(&$a) { if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { - echo '<li>' . translate_scope($item['public_policy']) . '</li>'; + + // if the post is private, but public_policy is blank ("visible to the internet"), and there aren't any + // specific recipients, we're the recipient of a post with "bcc" or targeted recipients; so we'll just show it + // as unknown specific recipients. The sender will have the visibility list and will fall through to the + // next section. + + echo '<li>' . translate_scope((! $item['public_policy']) ? PERMS_SPECIFIC : $item['public_policy']) . '</li>'; killme(); } @@ -78,9 +84,5 @@ function lockview_content(&$a) { echo $o . implode($l); killme(); - if(array_key_exists('public_policy',$item) && $item['public_policy']) { - echo '<li>' . translate_scope($item['public_policy']) . '</li>'; - killme(); - } } |