Fix bug of DisableGravatar default value (#22297)

lunny · KN4CK3R · web-flow · commit f1e07d8c879a · 2023-01-01T20:20:04.000+08:00
backport #22296 Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
diff --git a/models/system/setting.go b/models/system/setting.go
@@ -267,7 +267,7 @@ func Init() error {
 		enableFederatedAvatar = false
 	}
 
-	if disableGravatar || !enableFederatedAvatar {
+	if enableFederatedAvatar || !disableGravatar {
 		var err error
 		GravatarSourceURL, err = url.Parse(setting.GravatarSource)
 		if err != nil {
diff --git a/modules/setting/picture.go b/modules/setting/picture.go
@@ -69,7 +69,7 @@ func newPictureService() {
 }
 
 func GetDefaultDisableGravatar() bool {
-	return !OfflineMode
+	return OfflineMode
 }
 
 func GetDefaultEnableFederatedAvatar(disableGravatar bool) bool {

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ func Init() error {`
`267`	`267`	`enableFederatedAvatar = false`
`268`	`268`	`}`
`269`	`269`
`270`		`- if disableGravatar \|\| !enableFederatedAvatar {`
	`270`	`+ if enableFederatedAvatar \|\| !disableGravatar {`
`271`	`271`	`var err error`
`272`	`272`	`GravatarSourceURL, err = url.Parse(setting.GravatarSource)`
`273`	`273`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func newPictureService() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func GetDefaultDisableGravatar() bool {`
`72`		`- return !OfflineMode`
	`72`	`+ return OfflineMode`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`func GetDefaultEnableFederatedAvatar(disableGravatar bool) bool {`