From 99385db0c418fb49838eb1a23f391cf826d99202 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 7 Aug 2016 11:01:47 -0700 Subject: #3320 code cleanup --- modules/setting/setting.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'modules/setting') diff --git a/modules/setting/setting.go b/modules/setting/setting.go index b8e8f65e..84d78cd5 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -20,8 +20,8 @@ import ( _ "github.com/go-macaron/cache/redis" "github.com/go-macaron/session" _ "github.com/go-macaron/session/redis" - "gopkg.in/ini.v1" "github.com/strk/go-libravatar" + "gopkg.in/ini.v1" "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" @@ -141,11 +141,11 @@ var ( } // Picture settings - AvatarUploadPath string - GravatarSource string - DisableGravatar bool - EnableFederatedAvatar bool - LibravatarService *libravatar.Libravatar + AvatarUploadPath string + GravatarSource string + DisableGravatar bool + EnableFederatedAvatar bool + LibravatarService *libravatar.Libravatar // Log settings LogRootPath string @@ -470,8 +470,11 @@ func NewContext() { DisableGravatar = true EnableFederatedAvatar = false } + if DisableGravatar { + EnableFederatedAvatar = false + } - if !DisableGravatar && EnableFederatedAvatar { + if EnableFederatedAvatar { LibravatarService = libravatar.New() parts := strings.Split(GravatarSource, "/") if len(parts) >= 3 { -- cgit v1.2.3