summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2017-03-20 13:37:34 +0100
committerGeorge Goldberg <george@gberg.me>2017-03-20 12:37:34 +0000
commitac8282cda1455802f52ebe6687eeeef6c950bf49 (patch)
treea0eb38c5de6c6605399f91bf35b0fc5434bd4911 /model/config.go
parent9b10f3ef5450886bc2eb47fc58b649ff67109b1d (diff)
downloadchat-ac8282cda1455802f52ebe6687eeeef6c950bf49.tar.gz
chat-ac8282cda1455802f52ebe6687eeeef6c950bf49.tar.bz2
chat-ac8282cda1455802f52ebe6687eeeef6c950bf49.zip
Add updateConfig endpoint for apiV4 (#5706)
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go
index 86693b57e..8a2a5cc47 100644
--- a/model/config.go
+++ b/model/config.go
@@ -473,7 +473,7 @@ func (o *Config) SetDefaults() {
*o.FileSettings.MaxFileSize = 52428800 // 50 MB
}
- if len(*o.FileSettings.PublicLinkSalt) == 0 {
+ if o.FileSettings.PublicLinkSalt == nil || len(*o.FileSettings.PublicLinkSalt) == 0 {
o.FileSettings.PublicLinkSalt = new(string)
*o.FileSettings.PublicLinkSalt = NewRandomString(32)
}