diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-13 09:05:40 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-13 09:05:40 +0100 |
| commit | 150e238b02b442bc528b9626ef01215a18901995 (patch) | |
| tree | 28ad5a3e395666f475aa2a8c7f417d172b828763 /Zotlabs/Module/Item.php | |
| parent | b265a55b815e46658aadec9021bb00997cb40bc7 (diff) | |
| parent | ab1d47b36f21e5881900d9d805f4f7876f1c472f (diff) | |
| download | volse-hubzilla-150e238b02b442bc528b9626ef01215a18901995.tar.gz volse-hubzilla-150e238b02b442bc528b9626ef01215a18901995.tar.bz2 volse-hubzilla-150e238b02b442bc528b9626ef01215a18901995.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Item.php')
| -rw-r--r-- | Zotlabs/Module/Item.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 3f857030b..fba2ef7a4 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -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; |