Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
206492e15d
@ -26,11 +26,6 @@ function lockview_content(&$a) {
|
|||||||
|
|
||||||
$item = $r[0];
|
$item = $r[0];
|
||||||
|
|
||||||
if(array_key_exists('public_policy',$item) && $item['public_policy']) {
|
|
||||||
echo '<li>' . translate_scope($item['public_policy']) . '</li>';
|
|
||||||
killme();
|
|
||||||
}
|
|
||||||
|
|
||||||
if($item['uid'] != local_user()) {
|
if($item['uid'] != local_user()) {
|
||||||
echo '<li>' . t('Remote privacy information not available.') . '</li>';
|
echo '<li>' . t('Remote privacy information not available.') . '</li>';
|
||||||
killme();
|
killme();
|
||||||
@ -83,4 +78,8 @@ function lockview_content(&$a) {
|
|||||||
echo $o . implode($l);
|
echo $o . implode($l);
|
||||||
killme();
|
killme();
|
||||||
|
|
||||||
|
if(array_key_exists('public_policy',$item) && $item['public_policy']) {
|
||||||
|
echo '<li>' . translate_scope($item['public_policy']) . '</li>';
|
||||||
|
killme();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user