diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-03 16:41:40 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-03 16:41:40 -0700 |
| commit | bf3f3564e08754c3f91524798523839ae7b9094c (patch) | |
| tree | f1da047c364df5de64eb9467663787d2e5c6c0b3 /include/conversation.php | |
| parent | 102d41ccb96f67363d50941f5ce4ca9bfd2ae6d5 (diff) | |
| download | volse-hubzilla-bf3f3564e08754c3f91524798523839ae7b9094c.tar.gz volse-hubzilla-bf3f3564e08754c3f91524798523839ae7b9094c.tar.bz2 volse-hubzilla-bf3f3564e08754c3f91524798523839ae7b9094c.zip | |
issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity.
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 829e85382..5e9ba16a1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1592,6 +1592,7 @@ function network_tabs() { function profile_tabs($a, $is_owner = false, $nickname = null){ // Don't provide any profile tabs if we're running as the sys channel + if (App::$is_sys) return; @@ -1669,7 +1670,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ } - if ($p['chat']) { + if ($p['chat'] && feature_enabled($uid,'ajaxchat')) { require_once('include/chat.php'); $has_chats = chatroom_list_count($uid); if ($has_chats) { |