diff options
author | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
commit | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (patch) | |
tree | 499ab4cac571c35f6d0758f157ed85af46c8b57c /Zotlabs/Module/Thing.php | |
parent | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (diff) | |
parent | 7a557d31e026705fc3bd2d4f39c4c679449cef56 (diff) | |
download | volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.gz volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.bz2 volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Thing.php')
-rw-r--r-- | Zotlabs/Module/Thing.php | 8 |
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') )); |