Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-10-01 17:05:20 -07:00
parent ea4d1b5101 f70d27b793
commit 8bd4e004ff
5 changed files with 24 additions and 24 deletions
--- 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'],