harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix location setting stuff

Browse Source
This commit is contained in:
friendica
2013-05-28 17:16:16 -07:00
parent 6bb3583267
commit 0daaf35ff8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mod/channel.php
View File

@@ -118,9 +118,8 @@ function channel_content(&$a, $update = 0, $load = false) {
$x = array(
'is_owner' => $is_owner,
// FIXME
'allow_location' => ((($is_owner || $observer) && $a->profile['allow_location']) ? true : false),
'default_location' => (($is_owner) ? $a->profile['default_location'] : ''),
'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig($a->profile['profile_uid'],'system','use_browser_location')))) ? true : false),
'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''),
'nickname' => $a->profile['channel_address'],
'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
'acl' => (($is_owner) ? populate_acl($channel, false) : ''),