diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
| commit | 11c29e0cba4f521c5f37d963109c4807af8bccae (patch) | |
| tree | 3dde72ce8528cfa9cc6111098585623b5971b605 /mod/display.php | |
| parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
| parent | 2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff) | |
| download | volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.gz volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.bz2 volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/display.php')
| -rwxr-xr-x | mod/display.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/display.php b/mod/display.php index d96be4333..f428149e8 100755 --- a/mod/display.php +++ b/mod/display.php @@ -74,18 +74,18 @@ function display_content(&$a) { $x = array( 'is_owner' => true, 'allow_location' => $a->user['allow_location'], - 'default_location' => $a->user['default_location'], + 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], - 'lockstate' => ((($group) || (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'), - 'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb), - 'bang' => (($group || $cid) ? '!' : ''), + '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'), + 'acl' => populate_acl($a->user, $celeb), + 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user() ); $o .= status_editor($a,$x,0,true); - $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, |