diff options
| author | friendica <info@friendica.com> | 2014-04-07 20:20:28 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-07 20:20:28 -0700 |
| commit | 95751dddff2b1b7a2074d37a5b3102f256842ae4 (patch) | |
| tree | 792adfbbbd5d3158cdb6e5895a49a8d625e0ab43 | |
| parent | d820fa155bea343f7029e71a6691dc43d03eb138 (diff) | |
| download | volse-hubzilla-95751dddff2b1b7a2074d37a5b3102f256842ae4.tar.gz volse-hubzilla-95751dddff2b1b7a2074d37a5b3102f256842ae4.tar.bz2 volse-hubzilla-95751dddff2b1b7a2074d37a5b3102f256842ae4.zip | |
some fixes to #395
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/reddav.php | 2 | ||||
| -rw-r--r-- | mod/chat.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index e5cd3358f..8803e74e7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1516,7 +1516,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ } require_once('include/chat.php'); - $chats = chatroom_list($a->profile['profile_uid']); + $chats = chatroom_list($uid); $subdued = ((count($chats)) ? '' : ' subdued'); $tabs[] = array( 'label' => t('Chatrooms'), diff --git a/include/reddav.php b/include/reddav.php index 7c14ca472..03cfe1aab 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -887,7 +887,7 @@ class RedBrowser extends DAV\Browser\Plugin { require_once('include/conversation.php'); if($this->auth->channel_name) - $html = profile_tabs(get_app(),(($this->auth->channel_id == local_user()) ? true : false),$this->auth->channel_name); + $html = profile_tabs(get_app(),(($this->auth->owner_id == local_user()) ? true : false),$this->auth->owner_nick); $html .= " <body> diff --git a/mod/chat.php b/mod/chat.php index e007b50a8..88f456422 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -213,7 +213,7 @@ function chat_content(&$a) { require_once('include/conversation.php'); - $o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false)); + $o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false),$a->profile['channel_address']); require_once('include/widgets.php'); |