aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-14 15:13:53 -0700
committerfriendica <info@friendica.com>2014-06-14 15:13:53 -0700
commit794cded66e521cdc581e00e4c432694c3117cfed (patch)
tree5b0e95e8b7acd2c76e6f3d5b88962230fd7c0bc2 /include/conversation.php
parentca78adb0c04dce985dd6752f03acce75811167dc (diff)
parentc97aa4504e71140a342cc48b1d7ff81842cb108b (diff)
downloadvolse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.gz
volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.bz2
volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php24
1 files changed, 8 insertions, 16 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 21ce3bb66..ee4952d7e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1517,25 +1517,17 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
require_once('include/chat.php');
$chats = chatroom_list($uid);
- $subdued = ((count($chats)) ? '' : ' subdued');
- $tabs[] = array(
- 'label' => t('Chatrooms'),
- 'url' => $a->get_baseurl() . '/chat/' . $nickname,
- 'sel' => ((argv(0) == 'chat') ? 'active' . $subdued : '' . $subdued),
- 'title' => t('Chatrooms'),
- 'id' => 'chat-tab',
- );
-
-
- if($is_owner) {
+ if (count($chats)) {
$tabs[] = array(
- 'label' => t('Events'),
- 'url' => $a->get_baseurl() . '/events',
- 'sel' => ((argv(0) == 'events') ? 'active' : ''),
- 'title' => t('Events and Calendar'),
- 'id' => 'events-tab',
+ 'label' => t('Chatrooms'),
+ 'url' => $a->get_baseurl() . '/chat/' . $nickname,
+ 'sel' => ((argv(0) == 'chat') ? 'active' : '' ),
+ 'title' => t('Chatrooms'),
+ 'id' => 'chat-tab',
);
+ }
+ if($is_owner) {
$tabs[] = array(
'label' => t('Bookmarks'),
'url' => $a->get_baseurl() . '/bookmarks',