diff options
author | Corey Hulen <corey@hulen.com> | 2017-08-16 09:51:45 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-08-16 09:51:45 -0700 |
commit | 0ab490845aed0ce3b58cbffd8ec35be237abda1c (patch) | |
tree | 5310cce7e546f5a03f97245af473b62d382028e8 /app/notification.go | |
parent | 32265df8be5d530f5b79284792afb9451464ad3a (diff) | |
download | chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.gz chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.bz2 chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.zip |
PLT-6226 Fixing races with licensing (#7213)
* PLT-6226 Fixing races with licensing
* Fixing build issue
* Fixing licensing issue
* removing commented code
Diffstat (limited to 'app/notification.go')
-rw-r--r-- | app/notification.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/notification.go b/app/notification.go index 4fec40040..69bfa3b7a 100644 --- a/app/notification.go +++ b/app/notification.go @@ -236,7 +236,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe sendPushNotifications := false if *utils.Cfg.EmailSettings.SendPushNotifications { pushServer := *utils.Cfg.EmailSettings.PushNotificationServer - if pushServer == model.MHPNS && (!utils.IsLicensed || !*utils.License.Features.MHPNS) { + if pushServer == model.MHPNS && (!utils.IsLicensed() || !*utils.License().Features.MHPNS) { l4g.Warn(utils.T("api.post.send_notifications_and_forget.push_notification.mhpnsWarn")) sendPushNotifications = false } else { @@ -359,7 +359,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch } emailNotificationContentsType := model.EMAIL_NOTIFICATION_CONTENTS_FULL - if utils.IsLicensed && *utils.License.Features.EmailNotificationContents { + if utils.IsLicensed() && *utils.License().Features.EmailNotificationContents { emailNotificationContentsType = *utils.Cfg.EmailSettings.EmailNotificationContentsType } |