diff options
author | zotlabs <mike@macgirvin.com> | 2017-10-01 17:05:20 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-10-01 17:05:20 -0700 |
commit | 8bd4e004ffd1a10050a8ac1d440ef82e5d937837 (patch) | |
tree | a93dba296f6997a070c9c906f2e28a614b9375af /Zotlabs | |
parent | ea4d1b5101022f928336a20f193f8f73adb4d5a7 (diff) | |
parent | f70d27b79325fe661bf1492a61c295c469e494ef (diff) | |
download | volse-hubzilla-8bd4e004ffd1a10050a8ac1d440ef82e5d937837.tar.gz volse-hubzilla-8bd4e004ffd1a10050a8ac1d440ef82e5d937837.tar.bz2 volse-hubzilla-8bd4e004ffd1a10050a8ac1d440ef82e5d937837.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Card_edit.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index 6927c0b6f..7cc563fd2 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -105,6 +105,8 @@ class Card_edit extends \Zotlabs\Web\Controller { 'hide_expire' => false, 'showacl' => true, 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), + 'permissions' => $itm[0], + 'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'), 'ptyp' => $itm[0]['type'], 'mimeselect' => false, 'mimetype' => $itm[0]['mimetype'], |