diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
| commit | 97009a27482f4a744eded54132f9067e1a2e6c80 (patch) | |
| tree | f7d56c9b097ea63ef0c09d08ac13805188d4e739 /include/nav.php | |
| parent | a976f418e35a8f4651441a952c8f4c037cb8d2f9 (diff) | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| download | volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.gz volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.bz2 volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/nav.php b/include/nav.php index 58e13dd93..9baadc9b2 100644 --- a/include/nav.php +++ b/include/nav.php @@ -42,6 +42,10 @@ function nav($template = 'default') { require_once('include/conversation.php'); + $nav_apps = []; + $navbar_apps = []; + $channel_apps = []; + $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); @@ -378,16 +382,15 @@ function channel_apps($is_owner = false, $nickname = null) { if(App::$is_sys) return ''; - if(! get_pconfig($uid, 'system', 'channelapps','1')) - return ''; - $channel = App::get_channel(); if($channel && is_null($nickname)) $nickname = $channel['channel_address']; $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel()); - $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']); + + if(! get_pconfig($uid, 'system', 'channelapps','1')) + return; if($uid == local_channel()) { return; |