Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

2 files changed, 10 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6d9fb5dd1..eeb02d483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,6 +63,8 @@ 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)
 	- Fix an issue where the ability to use a portion of the message-id to display a message wasn't honoured in all cases
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');