diff options
| author | George Goldberg <george@gberg.me> | 2018-02-13 13:35:52 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-13 13:46:01 +0000 |
| commit | 5c101253c5987743cf1b3a8fe68814d748070622 (patch) | |
| tree | e2632505d051e7d15d6daf974ed8ac92095f82fe /api/license.go | |
| parent | b7fc3d7d35ca4dd16097715a66463392a1dfaf0a (diff) | |
| parent | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (diff) | |
| download | chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.gz chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.bz2 chat-5c101253c5987743cf1b3a8fe68814d748070622.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api/license.go')
| -rw-r--r-- | api/license.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/api/license.go b/api/license.go index 8eb7803e1..432442ad6 100644 --- a/api/license.go +++ b/api/license.go @@ -9,7 +9,6 @@ import ( "net/http" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitLicense() { @@ -83,7 +82,7 @@ func removeLicense(c *Context, w http.ResponseWriter, r *http.Request) { func getClientLicenceConfig(c *Context, w http.ResponseWriter, r *http.Request) { useSanitizedLicense := !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) - etag := utils.GetClientLicenseEtag(useSanitizedLicense) + etag := c.App.GetClientLicenseEtag(useSanitizedLicense) if c.HandleEtag(etag, "Get Client License Config", w, r) { return } @@ -91,9 +90,9 @@ func getClientLicenceConfig(c *Context, w http.ResponseWriter, r *http.Request) var clientLicense map[string]string if useSanitizedLicense { - clientLicense = utils.ClientLicense() + clientLicense = c.App.ClientLicense() } else { - clientLicense = utils.GetSanitizedClientLicense() + clientLicense = c.App.GetSanitizedClientLicense() } w.Header().Set(model.HEADER_ETAG_SERVER, etag) |