From 7b338c161bce8bdede54d85a5df5a0efe34eb874 Mon Sep 17 00:00:00 2001
From: Hanzei <16541325+hanzei@users.noreply.github.com>
Date: Fri, 5 Oct 2018 18:24:02 +0200
Subject: MM-12323: Fix trailing slash in ServiceSettings.SiteURL (#9463)

* Fix trailing slash in ServiceSettings.SiteURL

* Add test for LoadConfig

* Fix test

* Simplify test
---
 app/config.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'app/config.go')

diff --git a/app/config.go b/app/config.go
index fde38c13e..cb74bd1b3 100644
--- a/app/config.go
+++ b/app/config.go
@@ -61,13 +61,12 @@ func (a *App) LoadConfig(configFile string) *model.AppError {
 	if err != nil {
 		return err
 	}
+	*cfg.ServiceSettings.SiteURL = strings.TrimRight(*cfg.ServiceSettings.SiteURL, "/")
+	a.config.Store(cfg)
 
 	a.configFile = configPath
-
-	a.config.Store(cfg)
 	a.envConfig = envConfig
-
-	a.siteURL = strings.TrimRight(*cfg.ServiceSettings.SiteURL, "/")
+	a.siteURL = *cfg.ServiceSettings.SiteURL
 
 	a.InvokeConfigListeners(old, cfg)
 	return nil
-- 
cgit v1.2.3-1-g7c22