summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_body.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-23 10:53:57 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-23 10:53:57 +0500
commitcc904a7ec73a44a337908c685bfc311bdbe1ff85 (patch)
tree6fb865bb734cad0389490e4add11f2e308fe473c /web/react/components/post_body.jsx
parent79ce0dd914713aac9d2f1332202a48e7e0d338a3 (diff)
parent02a6f6b2cd4c0a6bf32b23961557c385039ae2f2 (diff)
downloadchat-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/components/post_body.jsx')
-rw-r--r--web/react/components/post_body.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index fb838b736..ae94bd42e 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -119,12 +119,12 @@ export default class PostBody extends React.Component {
this.setState({youtubeTitle: metadata.title});
}
- if (global.window.config.GoogleDeveloperKey && !this.receivedYoutubeData) {
+ if (global.window.mm_config.GoogleDeveloperKey && !this.receivedYoutubeData) {
$.ajax({
async: true,
url: 'https://www.googleapis.com/youtube/v3/videos',
type: 'GET',
- data: {part: 'snippet', id: youtubeId, key: global.window.config.GoogleDeveloperKey},
+ data: {part: 'snippet', id: youtubeId, key: global.window.mm_config.GoogleDeveloperKey},
success: success.bind(this)
});
}