diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
| commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
| tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /web/react/components/user_profile.jsx | |
| parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
| parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
| download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/user_profile.jsx')
| -rw-r--r-- | web/react/components/user_profile.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index 540331663..c4402ae23 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -67,13 +67,14 @@ export default class UserProfile extends React.Component { dataContent.push( <img className='user-popover__image' - src={'/api/v1/users/' + this.state.profile.id + '/image?time=' + this.state.profile.update_at} + src={'/api/v1/users/' + this.state.profile.id + '/image?time=' + this.state.profile.update_at + '&' + Utils.getSessionIndex()} height='128' width='128' key='user-popover-image' /> ); - if (!global.window.config.ShowEmailAddress === 'true') { + + if (!global.window.mm_config.ShowEmailAddress === 'true') { dataContent.push( <div className='text-nowrap' |