harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-10-29 17:55:38 -07:00
commit e219268a6e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/conversation.php
View File

@ -1551,16 +1551,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
); );
} }
require_once('include/chat.php'); if($p['chat']) {
$has_chats = chatroom_list_count($uid); require_once('include/chat.php');
if ($has_chats) { $has_chats = chatroom_list_count($uid);
$tabs[] = array( if ($has_chats) {
'label' => t('Chatrooms'), $tabs[] = array(
'url' => $a->get_baseurl() . '/chat/' . $nickname, 'label' => t('Chatrooms'),
'sel' => ((argv(0) == 'chat') ? 'active' : '' ), 'url' => $a->get_baseurl() . '/chat/' . $nickname,
'title' => t('Chatrooms'), 'sel' => ((argv(0) == 'chat') ? 'active' : '' ),
'id' => 'chat-tab', 'title' => t('Chatrooms'),
); 'id' => 'chat-tab',
);
}
} }
require_once('include/menu.php'); require_once('include/menu.php');