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

2
include/conversation.php
View File

@ -1551,6 +1551,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
); );
} }
if($p['chat']) {
require_once('include/chat.php'); require_once('include/chat.php');
$has_chats = chatroom_list_count($uid); $has_chats = chatroom_list_count($uid);
if ($has_chats) { if ($has_chats) {
@ -1562,6 +1563,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
'id' => 'chat-tab', 'id' => 'chat-tab',
); );
} }
}
require_once('include/menu.php'); require_once('include/menu.php');
$has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK); $has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);