From 0d11fc88ea2373557d41013a257bbb492653f8f6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 6 Sep 2016 14:56:18 -0400 Subject: Trim / from SiteURL before sending to client (#3966) --- utils/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'utils') 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) -- cgit v1.2.3-1-g7c22