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

obscure permission issue with custom permissions when using the highly discouraged advisory privacy modes

Browse Source
This commit is contained in:
zotlabs 2018-03-12 15:47:33 -07:00 committed by Mario Vavti
parent 092c1c8c4c
commit 62ad32cf2e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Item.php
View File

@ -830,6 +830,12 @@ class Item extends \Zotlabs\Web\Controller {
$datarray['plink'] = $plink;
$datarray['route'] = $route;
// A specific ACL over-rides public_policy completely
if(! empty_acl($datarray))
$datarray['public_policy'] = '';
if($iconfig)
$datarray['iconfig'] = $iconfig;

4
include/items.php
View File

@ -969,6 +969,10 @@ function import_author_unknown($x) {
return false;
}
function empty_acl($item) {
return (($item['allow_cid'] === EMPTY_STR && $item['allow_gid'] === EMPTY_STR && $item['deny_cid'] === EMPTY_STR && $item['deny_gid'] === EMPTY_STR) ? true : false);
}
function encode_item($item,$mirror = false) {
$x = array();
$x['type'] = 'activity';