diff options
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/async_client.jsx | 10 | ||||
| -rw-r--r-- | webapp/utils/markdown.jsx | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index 6f5f8a2cd..65cb2d258 100644 --- a/webapp/utils/async_client.jsx +++ b/webapp/utils/async_client.jsx @@ -603,7 +603,7 @@ export function getPosts(id) { ); } -export function getPostsBefore(postId, offset, numPost) { +export function getPostsBefore(postId, offset, numPost, isPost) { const channelId = ChannelStore.getCurrentId(); if (channelId == null) { return; @@ -624,7 +624,8 @@ export function getPostsBefore(postId, offset, numPost) { id: channelId, before: true, numRequested: numPost, - post_list: data + post_list: data, + isPost }); getProfiles(); @@ -638,7 +639,7 @@ export function getPostsBefore(postId, offset, numPost) { ); } -export function getPostsAfter(postId, offset, numPost) { +export function getPostsAfter(postId, offset, numPost, isPost) { const channelId = ChannelStore.getCurrentId(); if (channelId == null) { return; @@ -659,7 +660,8 @@ export function getPostsAfter(postId, offset, numPost) { id: channelId, before: false, numRequested: numPost, - post_list: data + post_list: data, + isPost }); getProfiles(); diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx index 73af4ae91..bd1e998b4 100644 --- a/webapp/utils/markdown.jsx +++ b/webapp/utils/markdown.jsx @@ -163,7 +163,7 @@ class MattermostMarkdownRenderer extends marked.Renderer { } // remove any links added to the text by hashtag or mention parsing since they'll break this link - output += '>' + text.replace(/<\/?a[^>]*>/, '') + '</a>'; + output += '>' + text.replace(/<\/?a[^>]*>/g, '') + '</a>'; return output; } |