aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-29 17:55:38 -0700
committerfriendica <info@friendica.com>2014-10-29 17:55:38 -0700
commite219268a6e968d4024bb72c7990b3f00639d73b7 (patch)
treef10b969f50f18939eda6b76ac1731bf9b600e035
parentcfbfdca610c96a4a3337b56f2be73aaab535c554 (diff)
parentfc704d1f2f274dd8a4c2906b9c017187c34a4060 (diff)
downloadvolse-hubzilla-e219268a6e968d4024bb72c7990b3f00639d73b7.tar.gz
volse-hubzilla-e219268a6e968d4024bb72c7990b3f00639d73b7.tar.bz2
volse-hubzilla-e219268a6e968d4024bb72c7990b3f00639d73b7.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/conversation.php22
1 files changed, 12 insertions, 10 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 48fe8af60..a531de9ba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1551,16 +1551,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
);
}
- require_once('include/chat.php');
- $has_chats = chatroom_list_count($uid);
- if ($has_chats) {
- $tabs[] = array(
- 'label' => t('Chatrooms'),
- 'url' => $a->get_baseurl() . '/chat/' . $nickname,
- 'sel' => ((argv(0) == 'chat') ? 'active' : '' ),
- 'title' => t('Chatrooms'),
- 'id' => 'chat-tab',
- );
+ if($p['chat']) {
+ require_once('include/chat.php');
+ $has_chats = chatroom_list_count($uid);
+ if ($has_chats) {
+ $tabs[] = array(
+ 'label' => t('Chatrooms'),
+ 'url' => $a->get_baseurl() . '/chat/' . $nickname,
+ 'sel' => ((argv(0) == 'chat') ? 'active' : '' ),
+ 'title' => t('Chatrooms'),
+ 'id' => 'chat-tab',
+ );
+ }
}
require_once('include/menu.php');