diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
| commit | f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7 (patch) | |
| tree | d3899b890408f6f16b2d5f543bf975475f1a5584 /api4/emoji.go | |
| parent | 51bd710ecdca6628461c9fa2679737073e4d5059 (diff) | |
| parent | a1656dffa98fbc8865e476b214e4e0c562547d39 (diff) | |
| download | chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.gz chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.bz2 chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/emoji.go')
| -rw-r--r-- | api4/emoji.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api4/emoji.go b/api4/emoji.go index ae4a35dd5..cfb5dd6ab 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -9,6 +9,7 @@ import ( "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/web" ) const ( @@ -197,7 +198,7 @@ func searchEmojis(c *Context, w http.ResponseWriter, r *http.Request) { return } - emojis, err := c.App.SearchEmoji(emojiSearch.Term, emojiSearch.PrefixOnly, PER_PAGE_MAXIMUM) + emojis, err := c.App.SearchEmoji(emojiSearch.Term, emojiSearch.PrefixOnly, web.PER_PAGE_MAXIMUM) if err != nil { c.Err = err return |