summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar_header.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-22 21:35:29 -0700
committerCorey Hulen <corey@hulen.com>2015-10-22 21:35:29 -0700
commit6a1934192f9e58b73bebdb4cfba555b281c81f13 (patch)
tree22f29ee70d3e87ec1cd0cfe50ba8442123105733 /web/react/components/sidebar_header.jsx
parent5ecf45e109a5910959e0cc6927b826ce5a406a7d (diff)
parent7384b0791e54b0fd980ce8c321566c2c42289c02 (diff)
downloadchat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.gz
chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.bz2
chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.zip
Merge pull request #1129 from mattermost/PLT-44
PLT-44 Inital support for multi-tab multi-team login
Diffstat (limited to 'web/react/components/sidebar_header.jsx')
-rw-r--r--web/react/components/sidebar_header.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index c3709bc0a..de28a8374 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -3,6 +3,7 @@
var NavbarDropdown = require('./navbar_dropdown.jsx');
var UserStore = require('../stores/user_store.jsx');
+const Utils = require('../utils/utils.jsx');
export default class SidebarHeader extends React.Component {
constructor(props) {
@@ -32,7 +33,7 @@ export default class SidebarHeader extends React.Component {
profilePicture = (
<img
className='user__picture'
- src={'/api/v1/users/' + me.id + '/image?time=' + me.update_at}
+ src={'/api/v1/users/' + me.id + '/image?time=' + me.update_at + '&' + Utils.getSessionIndex()}
/>
);
}
@@ -61,7 +62,7 @@ export default class SidebarHeader extends React.Component {
}
SidebarHeader.defaultProps = {
- teamDisplayName: global.window.config.SiteName,
+ teamDisplayName: global.window.mm_config.SiteName,
teamType: ''
};
SidebarHeader.propTypes = {