diff options
| author | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
| commit | f8289eb286d00c29859a8df495b957c7b46cb249 (patch) | |
| tree | 1bc18d6a3a795482c7229786f7ab427fabbcd007 /app/license.go | |
| parent | 8891fa2a5e9e08eb9fa99ec163c47a6e9761a816 (diff) | |
| parent | 30197584d5a215a3b25bffa79a034ed9e360cf52 (diff) | |
| download | chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.gz chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.bz2 chat-f8289eb286d00c29859a8df495b957c7b46cb249.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'app/license.go')
| -rw-r--r-- | app/license.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/license.go b/app/license.go index 6a2206747..148b10317 100644 --- a/app/license.go +++ b/app/license.go @@ -129,7 +129,7 @@ func (a *App) SetLicense(license *model.License) bool { } a.licenseValue.Store((*model.License)(nil)) - a.SetClientLicense(map[string]string{"IsLicensed": "false"}) + a.clientLicenseValue.Store(map[string]string(nil)) return false } @@ -148,8 +148,10 @@ func (a *App) SetClientLicense(m map[string]string) { } func (a *App) ClientLicense() map[string]string { - clientLicense, _ := a.clientLicenseValue.Load().(map[string]string) - return clientLicense + if clientLicense, _ := a.clientLicenseValue.Load().(map[string]string); clientLicense != nil { + return clientLicense + } + return map[string]string{"IsLicensed": "false"} } func (a *App) RemoveLicense() *model.AppError { |