diff options
| author | M. Dent <dentm42@gmail.com> | 2019-03-15 02:51:51 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-03-15 02:51:51 +0100 |
| commit | a22406c9f83b61368dc108dbab1e9ce254ebedfa (patch) | |
| tree | 29feeb54f4de964f1083349fc4bbbd454cf18f3e /include/nav.php | |
| parent | 8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff) | |
| parent | ebc3666c6f9a14db7efba849c4837d45688f030f (diff) | |
| download | volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.tar.gz volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.tar.bz2 volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.zip | |
Merge branch 'cleanup' into 'dev'
Cleanup and fixes
See merge request hubzilla/core!1554
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; |