diff options
| author | friendica <info@friendica.com> | 2013-01-31 23:56:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-31 23:56:46 -0800 |
| commit | 5ca88ca10a11a76237aa34d1d93ba3e878567767 (patch) | |
| tree | 01f0ed98ea409e8183469bf616c572cd9046cee7 /mod/channel.php | |
| parent | 6b3d36c36d9a1c2da3e338ef7802c77b5fd82167 (diff) | |
| download | volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.tar.gz volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.tar.bz2 volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.zip | |
debugging of file attachment api - somewhat functional but the attachment info structure in the item table needs to be re-done.
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index 3f92539ae..c74b40c00 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -118,8 +118,9 @@ 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->user['default-location'] : ''), + 'default_location' => (($is_owner) ? $a->profile['default_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) : ''), |