Merge pull request #1623 from turt2live/travis/presence-break

Disable presence controls if there's no presence

src/components/views/avatars/MemberPresenceAvatar.js

@@ -25,6 +25,7 @@ import dispatcher from "../../../dispatcher";
 import * as ContextualMenu from "../../structures/ContextualMenu";
 import SettingsStore from "../../../settings/SettingsStore";
 
+// This is an avatar with presence information and controls on it.
 module.exports = React.createClass({
     displayName: 'MemberPresenceAvatar',
 
@@ -142,7 +143,8 @@ module.exports = React.createClass({
         );
 
         // LABS: Disable presence management functions for now
-        if (!SettingsStore.isFeatureEnabled("feature_presence_management")) {
+        // Also disable the presence information if there's no status information
+        if (!SettingsStore.isFeatureEnabled("feature_presence_management") || !this.state.status) {
             statusNode = null;
             onClickFn = null;
         }