summaryrefslogtreecommitdiffstats
path: root/webapp/actions
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-10 13:58:01 -0400
committerSaturnino Abril <saturnino.abril@gmail.com>2017-07-11 01:58:01 +0800
commit45e7ad0c3428b4a050fedb354048f8a66aedf2a0 (patch)
tree5c98dab8975a7efc8b7bbb4785e4bdd8b30455d1 /webapp/actions
parent9a7453e20853c9fe347a17524e58a183afffcab8 (diff)
downloadchat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.tar.gz
chat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.tar.bz2
chat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.zip
Fix out of order posts for admins plus two minor fixes (#6886)
Diffstat (limited to 'webapp/actions')
-rw-r--r--webapp/actions/emoji_actions.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/actions/emoji_actions.jsx b/webapp/actions/emoji_actions.jsx
index a6323449e..1c0d8b5ea 100644
--- a/webapp/actions/emoji_actions.jsx
+++ b/webapp/actions/emoji_actions.jsx
@@ -13,7 +13,7 @@ import {getProfilesByIds} from 'mattermost-redux/actions/users';
import * as EmojiActions from 'mattermost-redux/actions/emojis';
export async function loadEmoji(getProfiles = true) {
- const data = await EmojiActions.getAllCustomEmojis(10000)(dispatch, getState);
+ const data = await EmojiActions.getAllCustomEmojis()(dispatch, getState);
if (data && getProfiles) {
loadProfilesForEmoji(data);