diff options
| author | friendica <info@friendica.com> | 2014-09-20 16:22:21 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-20 16:22:21 -0700 |
| commit | 44cb423f21b6a34a138e7ffd2814fdd08788cfbe (patch) | |
| tree | bbd84e79b59b3e6ccd848758a65aeae9033d37fa /include/conversation.php | |
| parent | 8d23a8da8dd7326d6ce9c3a64f96e5325a09d4a1 (diff) | |
| parent | a1773fea2529e6e3b1dcc816e948dacb4a250705 (diff) | |
| download | volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.tar.gz volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.tar.bz2 volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index a4d94f946..4c030662c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1552,8 +1552,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ } require_once('include/chat.php'); - $chats = chatroom_list($uid); - if (count($chats)) { + $has_chats = chatroom_list_count($uid); + if ($has_chats) { $tabs[] = array( 'label' => t('Chatrooms'), 'url' => $a->get_baseurl() . '/chat/' . $nickname, @@ -1563,7 +1563,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ ); } - if($is_owner) { + require_once('include/menu.php'); + $has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK); + if($is_owner && $has_bookmarks) { $tabs[] = array( 'label' => t('Bookmarks'), 'url' => $a->get_baseurl() . '/bookmarks', |