summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-07-06 08:48:34 +0800
committerGitHub <noreply@github.com>2017-07-06 08:48:34 +0800
commit279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (patch)
treee94482d436da3bc8eb0d4021edbf5631cb75322d /utils
parent918ce03622c3fb618a13c240e7c4d51edf5a818b (diff)
downloadchat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.gz
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.bz2
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.zip
[PLT-6969] System console setting for the emoji picker (#6809)
* system console setting for the emoji picker * remove state.emojiPickerEnable * update url to /admin_console/customization/emoji
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index fa7c7fbf3..22ece13a4 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -462,6 +462,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["SQLDriverName"] = c.SqlSettings.DriverName
props["EnableCustomEmoji"] = strconv.FormatBool(*c.ServiceSettings.EnableCustomEmoji)
+ props["EnableEmojiPicker"] = strconv.FormatBool(*c.ServiceSettings.EnableEmojiPicker)
props["RestrictCustomEmojiCreation"] = *c.ServiceSettings.RestrictCustomEmojiCreation
props["MaxFileSize"] = strconv.FormatInt(*c.FileSettings.MaxFileSize, 10)