diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 18:57:06 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 18:57:06 -0700 |
| commit | f3b560b4535594d1b1189a3d3a5b7070f8e96beb (patch) | |
| tree | 5c1a072d45f655c736e56b74dc2a32f9ed8445b3 | |
| parent | 43e064749cfb5cd9d4a0e64991bf297f28a3a6d4 (diff) | |
| download | volse-hubzilla-f3b560b4535594d1b1189a3d3a5b7070f8e96beb.tar.gz volse-hubzilla-f3b560b4535594d1b1189a3d3a5b7070f8e96beb.tar.bz2 volse-hubzilla-f3b560b4535594d1b1189a3d3a5b7070f8e96beb.zip | |
fix the lock state when using forum mode
| -rw-r--r-- | mod/network.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php index 77be7e96e..3614c81d6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -158,14 +158,16 @@ function network_content(&$a, $update = 0, $load = false) { 'deny_gid' => $channel['channel_deny_gid'] ); + $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); + $x = array( 'is_owner' => true, 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl((($group || $cid) ? $def_acl : $channel_acl)), - 'bang' => (($group || $cid) ? '!' : ''), + 'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl)), + 'bang' => (($private_editing) ? '!' : ''), 'visitor' => true, 'profile_uid' => local_channel() ); |