Merge branch 'master' into develop

This commit is contained in:
Fabrixxm 2015-07-06 16:56:49 +02:00
commit 95945ecae6
7 changed files with 15254 additions and 15417 deletions

View file

@ -27,7 +27,7 @@ function bookmarklet_content(&$a) {
'nickname' => $a->user['nickname'],
'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
'default_perms' => get_acl_permissions($a->user),
'acl' => populate_acl($a->user),
'acl' => populate_acl($a->user,true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),