From 45e7ad0c3428b4a050fedb354048f8a66aedf2a0 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 10 Jul 2017 13:58:01 -0400
Subject: Fix out of order posts for admins plus two minor fixes (#6886)

---
 webapp/actions/emoji_actions.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp/actions')

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);
-- 
cgit v1.2.3-1-g7c22