diff options
author | Chris <ccbrown112@gmail.com> | 2018-02-22 18:23:32 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 18:23:32 -0600 |
commit | d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd (patch) | |
tree | 250e6f64e10631d6e0470e57916d82c897fc8b6a /utils | |
parent | 1b3808f3ecf754876168a9342e18c46d49f32ddf (diff) | |
download | chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.tar.gz chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.tar.bz2 chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.zip |
Remove global site url (#8343)
* remove global site url
* missed one
* revert mysterious change
Diffstat (limited to 'utils')
-rw-r--r-- | utils/api.go | 2 | ||||
-rw-r--r-- | utils/config.go | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/utils/api.go b/utils/api.go index 51524074d..0f2640829 100644 --- a/utils/api.go +++ b/utils/api.go @@ -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) diff --git a/utils/config.go b/utils/config.go index 0d3047c5d..afb2e758c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -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 |