Cleanup and fixes

This commit is contained in:
Mario
2019-03-15 02:51:51 +01:00
committed by M. Dent
parent 8769fa0156
commit ebc3666c6f
11 changed files with 55 additions and 74 deletions

View File

@@ -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;