IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove global site url (#8343)

Browse Source 
* remove global site url

* missed one

* revert mysterious change
This commit is contained in:
Chris
2018-02-22 18:23:32 -06:00
committed by GitHub
parent 1b3808f3ec
commit d44ef7ea67
12 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/api.go
View File

@@ -52,7 +52,7 @@ func RenderWebError(w http.ResponseWriter, r *http.Request, status int, params u
http.Error(w, "", http.StatusInternalServerError)
return
}
destination := strings.TrimRight(GetSiteURL(), "/") + "/error?" + queryString + "&s=" + base64.URLEncoding.EncodeToString(signature)
destination := "/error?" + queryString + "&s=" + base64.URLEncoding.EncodeToString(signature)
if status >= 300 && status < 400 {
http.Redirect(w, r, destination, status)

9
utils/config.go
View File

@@ -34,15 +34,6 @@ const (
)
var originalDisableDebugLvl l4g.Level = l4g.DEBUG
var siteURL = ""
func GetSiteURL() string {
return siteURL
}
func SetSiteURL(url string) {
siteURL = strings.TrimRight(url, "/")
}
// FindConfigFile attempts to find an existing configuration file. fileName can be an absolute or
// relative path or name such as "/opt/mattermost/config.json" or simply "config.json". An empty