diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
| commit | b71a3af4570ccf349804b9ffa151fc1d35287d88 (patch) | |
| tree | 264c012a0c8ca28c4035666d35c547a829968a2a /mod/network.php | |
| parent | f5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff) | |
| parent | fb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff) | |
| download | volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.gz volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.bz2 volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.zip | |
Merge remote-tracking branch 'friendica/master' into randomerror
Diffstat (limited to 'mod/network.php')
| -rwxr-xr-x | mod/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
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), |