diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-09 10:04:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 10:04:48 -0600 |
| commit | a6309aaf48e216fe5f6779188071d4b621b643b6 (patch) | |
| tree | 9abbac7f172822e2286c755725fe3533cde8de8a /api4/system.go | |
| parent | 7e8106b95c11a4187f8c00256f3067433d20b24e (diff) | |
| download | chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.gz chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.bz2 chat-a6309aaf48e216fe5f6779188071d4b621b643b6.zip | |
Remove license globals entirely (#8229)
* remove license globals entirely
* fix infinite recursion
* test fix
Diffstat (limited to 'api4/system.go')
| -rw-r--r-- | api4/system.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/system.go b/api4/system.go index 43b941247..061ffe094 100644 --- a/api4/system.go +++ b/api4/system.go @@ -266,7 +266,7 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) { return } - etag := utils.GetClientLicenseEtag(true) + etag := c.App.GetClientLicenseEtag(true) if c.HandleEtag(etag, "Get Client License", w, r) { return } @@ -274,9 +274,9 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) { var clientLicense map[string]string if c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - clientLicense = utils.ClientLicense() + clientLicense = c.App.ClientLicense() } else { - clientLicense = utils.GetSanitizedClientLicense() + clientLicense = c.App.GetSanitizedClientLicense() } w.Header().Set(model.HEADER_ETAG_SERVER, etag) |