diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-09-06 14:56:18 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-06 14:56:18 -0400 |
| commit | 0d11fc88ea2373557d41013a257bbb492653f8f6 (patch) | |
| tree | 020645c8d0dd6fb8b5e6d72a5704ccfd47e3d24e /utils | |
| parent | 558821bc546fbb00ece4d4635011e4a6cca5e252 (diff) | |
| download | chat-0d11fc88ea2373557d41013a257bbb492653f8f6.tar.gz chat-0d11fc88ea2373557d41013a257bbb492653f8f6.tar.bz2 chat-0d11fc88ea2373557d41013a257bbb492653f8f6.zip | |
Trim / from SiteURL before sending to client (#3966)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go index f4186d352..8ef629a9d 100644 --- a/utils/config.go +++ b/utils/config.go @@ -11,6 +11,7 @@ import ( "os" "path/filepath" "strconv" + "strings" l4g "github.com/alecthomas/log4go" @@ -218,7 +219,7 @@ func getClientConfig(c *model.Config) map[string]string { props["BuildHashEnterprise"] = model.BuildHashEnterprise props["BuildEnterpriseReady"] = model.BuildEnterpriseReady - props["SiteURL"] = *c.ServiceSettings.SiteURL + props["SiteURL"] = strings.TrimRight(*c.ServiceSettings.SiteURL, "/") props["SiteName"] = c.TeamSettings.SiteName props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation) props["EnableUserCreation"] = strconv.FormatBool(c.TeamSettings.EnableUserCreation) |