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 /api4/system.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 '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) |