From 09da109ebaf1b5f287db7065eaee5026b0a88eb1 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Wed, 9 Aug 2017 20:45:59 +0200 Subject: [PATCH 1/3] update changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 6d9fb5dd1..1318a5c11 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,6 +63,7 @@ Hubzilla 2.6 (2017-??-??) - Replace Mardownify library with html-to-markdown library Bugfixes + - Fix wrong wiki pages in the sidebar github issue #841 - Fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder - Fix privacy groups not syncing across clones properly (github issue #832) - Fix an issue where the ability to use a portion of the message-id to display a message wasn't honoured in all cases From 9411732c1b0a4aa07528763381313adc7a775da6 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 10 Aug 2017 11:41:00 +0200 Subject: [PATCH 2/3] do not show channel manager and nav channel select if we are in a delegate session --- include/nav.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/nav.php b/include/nav.php index f53a3eed5..76a8f8fb9 100644 --- a/include/nav.php +++ b/include/nav.php @@ -34,9 +34,11 @@ EOT; intval($channel['channel_id']) ); - $chans = q("select channel_name, channel_id from channel where channel_account_id = %d and channel_removed = 0 order by channel_name ", - intval(get_account_id()) - ); + if(! $_SESSION['delegate']) { + $chans = q("select channel_name, channel_id from channel where channel_account_id = %d and channel_removed = 0 order by channel_name ", + intval(get_account_id()) + ); + } } elseif(remote_channel()) $observer = App::get_observer(); @@ -196,7 +198,9 @@ EOT; $nav['all_events']['all']=array('events', t('View events'), "", ""); $nav['all_events']['mark'] = array('', t('Mark all events seen'), '',''); - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); + if(! $_SESSION['delegate']) { + $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); + } $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); From 5b88e9574f5db517dd5bb7b893f177446abbe95c Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 10 Aug 2017 11:59:12 +0200 Subject: [PATCH 3/3] update changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 1318a5c11..eeb02d483 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,6 +63,7 @@ Hubzilla 2.6 (2017-??-??) - Replace Mardownify library with html-to-markdown library Bugfixes + - Fix channel manager and nav channel select visible if in a delegate session - Fix wrong wiki pages in the sidebar github issue #841 - Fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder - Fix privacy groups not syncing across clones properly (github issue #832)