aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Thing.php
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-08-06 07:50:21 +1000
committerGitHub <noreply@github.com>2016-08-06 07:50:21 +1000
commit1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (patch)
tree95e9b493a6fd9b9370b230a11d59be73b9fcedd2 /Zotlabs/Module/Thing.php
parent709206accde6136f96f1484510edc4b61b3d52a7 (diff)
parent531baa8fc4c29c10afdf52fc88174b8b6fd69700 (diff)
downloadvolse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.gz
volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.bz2
volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.zip
Merge pull request #477 from git-marijus/dev
Some work to make multiple acl forms per page work
Diffstat (limited to 'Zotlabs/Module/Thing.php')
-rw-r--r--Zotlabs/Module/Thing.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index 65fc0588e..a7ac63f73 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -312,6 +312,10 @@ class Thing extends \Zotlabs\Web\Controller {
'$imgurl' => $r[0]['obj_imgurl'],
'$permissions' => t('Permissions'),
'$aclselect' => populate_acl($channel_acl,false),
+ '$allow_cid' => acl2json($channel_acl['allow_cid']),
+ '$allow_gid' => acl2json($channel_acl['allow_gid']),
+ '$deny_cid' => acl2json($channel_acl['deny_cid']),
+ '$deny_gid' => acl2json($channel_acl['deny_gid']),
'$lockstate' => $lockstate,
'$submit' => t('Submit')
));
@@ -358,6 +362,10 @@ class Thing extends \Zotlabs\Web\Controller {
'$img_lbl' => t('URL for photo of thing (optional)'),
'$permissions' => t('Permissions'),
'$aclselect' => populate_acl($channel_acl,false),
+ '$allow_cid' => acl2json($channel_acl['allow_cid']),
+ '$allow_gid' => acl2json($channel_acl['allow_gid']),
+ '$deny_cid' => acl2json($channel_acl['deny_cid']),
+ '$deny_gid' => acl2json($channel_acl['deny_gid']),
'$lockstate' => $lockstate,
'$submit' => t('Submit')
));