diff options
| author | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
| commit | 20817b4b8ea8b7d074d57a3fd752862931cf711c (patch) | |
| tree | fd0344bd209043c4d8191ef68dceb1499cf7dd9a /mod/display.php | |
| parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
| parent | f1bf6dcdfb89bf3c21e498ba3d76c600dafed934 (diff) | |
| download | volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.gz volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.bz2 volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/display.php')
| -rwxr-xr-x | mod/display.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/display.php b/mod/display.php index d96be4333..f510f793d 100755 --- a/mod/display.php +++ b/mod/display.php @@ -74,11 +74,11 @@ 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() ); |