diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
| commit | cc904a7ec73a44a337908c685bfc311bdbe1ff85 (patch) | |
| tree | 6fb865bb734cad0389490e4add11f2e308fe473c /web/react/utils/utils.jsx | |
| parent | 79ce0dd914713aac9d2f1332202a48e7e0d338a3 (diff) | |
| parent | 02a6f6b2cd4c0a6bf32b23961557c385039ae2f2 (diff) | |
| download | chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.gz chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.bz2 chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 9fc98e3d5..3d0cee562 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -869,7 +869,7 @@ export function getFileUrl(filename) { if (url.indexOf('/api/v1/files/get') !== -1) { url = filename.split('/api/v1/files/get')[1]; } - url = getWindowLocationOrigin() + '/api/v1/files/get' + url; + url = getWindowLocationOrigin() + '/api/v1/files/get' + url + '?' + getSessionIndex(); return url; } @@ -880,6 +880,14 @@ export function getFileName(path) { return split[split.length - 1]; } +export function getSessionIndex() { + if (global.window.mm_session_token_index >= 0) { + return 'session_token_index=' + global.window.mm_session_token_index; + } + + return ''; +} + // Generates a RFC-4122 version 4 compliant globally unique identifier. export function generateId() { // implementation taken from http://stackoverflow.com/a/2117523 |