diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 12:02:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 12:02:54 -0600 |
| commit | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (patch) | |
| tree | a99a74d6b858d73624c06f85e393acbe97c90586 /api4/system.go | |
| parent | 9707ac3aaf2cb4352c573aadf54b8535e237dd9e (diff) | |
| parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
| download | chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.gz chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.bz2 chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.zip | |
Merge branch 'master' into release-4.7
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) |