diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
| commit | 7e418714bce067172e527359f391943459b3bd48 (patch) | |
| tree | fb06d542eddb5ce8d63fce27bfe87f6c9c63adbb /web/react/components/sidebar_right_menu.jsx | |
| parent | 9828d84f01147ffb87b372d20681f91325ecfcf0 (diff) | |
| parent | 4e3896d7b1911b8c184dee3c650461f0d3c0acea (diff) | |
| download | chat-7e418714bce067172e527359f391943459b3bd48.tar.gz chat-7e418714bce067172e527359f391943459b3bd48.tar.bz2 chat-7e418714bce067172e527359f391943459b3bd48.zip | |
Merge pull request #687 from mattermost/PLT-93
PLT-93 Cleaning up client side configs
Diffstat (limited to 'web/react/components/sidebar_right_menu.jsx')
| -rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index bd10a6ef1..5ecd502ba 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -4,7 +4,6 @@ var UserStore = require('../stores/user_store.jsx'); var client = require('../utils/client.jsx'); var utils = require('../utils/utils.jsx'); -import {config} from '../utils/config.js'; export default class SidebarRightMenu extends React.Component { constructor(props) { @@ -75,8 +74,8 @@ export default class SidebarRightMenu extends React.Component { } var siteName = ''; - if (config.SiteName != null) { - siteName = config.SiteName; + if (global.window.config.SiteName != null) { + siteName = global.window.config.SiteName; } var teamDisplayName = siteName; if (this.props.teamDisplayName) { |