From ca14ab3d555476861cf60063208249676aae8954 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 17:24:48 +0100 Subject: move profile tabs to app-tray --- include/conversation.php | 2 +- include/nav.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/conversation.php b/include/conversation.php index a8887a428..99604f942 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1917,7 +1917,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); call_hooks('profile_tabs', $arr); - $tpl = get_markup_template('common_tabs.tpl'); + $tpl = get_markup_template('profile_tabs.tpl'); return replace_macros($tpl,array('$tabs' => $arr['tabs'])); } diff --git a/include/nav.php b/include/nav.php index 07d679aa8..2d12f2950 100644 --- a/include/nav.php +++ b/include/nav.php @@ -36,7 +36,10 @@ EOT; } elseif(remote_channel()) $observer = App::get_observer(); - + + require_once('include/conversation.php'); + $is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false); + $navapps[] = profile_tabs($a, $is_owner, \App::$profile['channel_address']); $myident = (($channel) ? $channel['xchan_addr'] : ''); -- cgit v1.2.3