diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
| commit | e017babc5ddd66e65469326bf723d5359875c2d1 (patch) | |
| tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /web/react/components/search_results.jsx | |
| parent | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (diff) | |
| parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
| download | chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.gz chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.bz2 chat-e017babc5ddd66e65469326bf723d5359875c2d1.zip | |
fixing merge
Diffstat (limited to 'web/react/components/search_results.jsx')
| -rw-r--r-- | web/react/components/search_results.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx index 003a38b7e..156cf0120 100644 --- a/web/react/components/search_results.jsx +++ b/web/react/components/search_results.jsx @@ -76,6 +76,7 @@ SearchItem = React.createClass({ var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch}); var channelName = ""; var channel = ChannelStore.get(this.props.post.channel_id) + var timestamp = UserStore.getCurrentUser().update_at; if (channel) { if (channel.type === 'D') { @@ -89,7 +90,7 @@ SearchItem = React.createClass({ <div className="search-item-container post" onClick={this.handleClick}> <div className="search-channel__name">{ channelName }</div> <div className="post-profile-img__container"> - <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" /> + <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" /> </div> <div className="post__content"> <ul className="post-header"> |