diff options
| author | friendica <info@friendica.com> | 2012-02-28 14:52:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-28 14:52:23 -0800 |
| commit | 4dd4a2258235cfafc0d5a4f87d116755ebe52ead (patch) | |
| tree | f99c8008663f88d29e75fb6c04f95e6b0a336250 /mod | |
| parent | 53412dacd4cb52f0c1162af7ba66aa01f71147b3 (diff) | |
| download | volse-hubzilla-4dd4a2258235cfafc0d5a4f87d116755ebe52ead.tar.gz volse-hubzilla-4dd4a2258235cfafc0d5a4f87d116755ebe52ead.tar.bz2 volse-hubzilla-4dd4a2258235cfafc0d5a4f87d116755ebe52ead.zip | |
From Tobias H - catch some irregularities caused by cut/paste code
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/display.php | 8 | ||||
| -rwxr-xr-x | mod/network.php | 2 |
2 files changed, 5 insertions, 5 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() ); diff --git a/mod/network.php b/mod/network.php index 03a671b61..894ac48ed 100755 --- a/mod/network.php +++ b/mod/network.php @@ -263,7 +263,7 @@ function network_content(&$a, $update = 0) { $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), |