aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-03-15 02:51:51 +0100
committerM. Dent <dentm42@gmail.com>2019-03-15 02:51:51 +0100
commitebc3666c6f9a14db7efba849c4837d45688f030f (patch)
tree29feeb54f4de964f1083349fc4bbbd454cf18f3e /include/nav.php
parent8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff)
downloadvolse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.tar.gz
volse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.tar.bz2
volse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.zip
Cleanup and fixes
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php11
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;