diff options
author | mrjive <mrjive@mrjive.it> | 2018-03-13 10:59:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 10:59:21 +0100 |
commit | 790660e61264ed884a8c600f407cf75893ffe977 (patch) | |
tree | 8fb3e4263cd7cdf4b34e0d7bb859c2f290c8ab39 /Zotlabs/Module/Item.php | |
parent | 2bcfa0c12687d47c11e8c445a5a38ffe96d5c135 (diff) | |
parent | 53c1d3775cc140ecda50d837752adac851d9e0b2 (diff) | |
download | volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.tar.gz volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.tar.bz2 volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.zip |
Merge pull request #18 from redmatrix/dev
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; |