diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-01 17:04:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-01 17:04:47 -0700 |
| commit | 47b29594867deb96f6b93d8a5ace8d4d4e569630 (patch) | |
| tree | 1e7dd09cbb7a6c1e18c9a3ae81928382bccf961c /Zotlabs | |
| parent | c61853ff0b06c1e41de0e0dfff6b660b693d5e3b (diff) | |
| parent | f70d27b79325fe661bf1492a61c295c469e494ef (diff) | |
| download | volse-hubzilla-47b29594867deb96f6b93d8a5ace8d4d4e569630.tar.gz volse-hubzilla-47b29594867deb96f6b93d8a5ace8d4d4e569630.tar.bz2 volse-hubzilla-47b29594867deb96f6b93d8a5ace8d4d4e569630.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_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'], |