From 7b24b78af949f2645459e4698ee2f96a17becef4 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Mar 2014 00:35:46 -0700 Subject: add fh to other page templates --- mod/channel.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/channel.php') diff --git a/mod/channel.php b/mod/channel.php index 34a1e2dda..0551f2645 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -259,6 +259,7 @@ function channel_content(&$a, $update = 0, $load = false) { '$spam' => '0', '$nouveau' => '0', '$wall' => '1', + '$fh' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => '', '$order' => '', -- cgit v1.2.3 From 9f621dac85c1c417b17d031e3ca2798c6b63ece7 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 8 Apr 2014 22:07:06 +0200 Subject: change the way jot tools are displayed/hidden --- mod/channel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/channel.php') diff --git a/mod/channel.php b/mod/channel.php index 0551f2645..9ee82a682 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -115,7 +115,7 @@ function channel_content(&$a, $update = 0, $load = false) { 'acl' => (($is_owner) ? populate_acl($channel_acl) : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', - 'visitor' => (($is_owner || $observer) ? 'block' : 'none'), + 'visitor' => (($is_owner || $observer) ? true : false), 'profile_uid' => $a->profile['profile_uid'] ); -- cgit v1.2.3 From 8b39b5ae4e56535c11fe192f64db3e923d608066 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 11 Apr 2014 15:51:25 -0700 Subject: via Mario: default channel permissions not working on channel page --- mod/channel.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'mod/channel.php') diff --git a/mod/channel.php b/mod/channel.php index 9ee82a682..395160d2c 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -74,6 +74,7 @@ function channel_content(&$a, $update = 0, $load = false) { $is_owner = (((local_user()) && ($a->profile['profile_uid'] == local_user())) ? true : false); + $channel = $a->get_channel(); $observer = $a->get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); @@ -96,12 +97,16 @@ function channel_content(&$a, $update = 0, $load = false) { $o .= common_friends_visitor_widget($a->profile['profile_uid']); - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); + if($channel && $is_owner) { + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } + else + $channel_acl = array(); if($perms['post_wall']) { -- cgit v1.2.3