config BASE64_EMBED_IMAGES, TODO squash

Author: sommerf-lf

modules/setting/mailer.go

@@ -28,7 +28,7 @@ type Mailer struct {
 	SendAsPlainText      bool                `ini:"SEND_AS_PLAIN_TEXT"`
 	SubjectPrefix        string              `ini:"SUBJECT_PREFIX"`
 	OverrideHeader       map[string][]string `ini:"-"`
-	B64EmbedImages       bool                `ini:"-"`
+	Base64EmbedImages    bool                `ini:"BASE64_EMBED_IMAGES"`
 
 	// SMTP sender
 	Protocol             string `ini:"PROTOCOL"`
@@ -151,6 +151,7 @@ func loadMailerFrom(rootCfg ConfigProvider) {
 	sec.Key("SENDMAIL_TIMEOUT").MustDuration(5 * time.Minute)
 	sec.Key("SENDMAIL_CONVERT_CRLF").MustBool(true)
 	sec.Key("FROM").MustString(sec.Key("USER").String())
+	sec.Key("BASE64_EMBED_IMAGES").MustBool(false)
 
 	// Now map the values on to the MailService
 	MailService = &Mailer{}

services/mailer/mail.go

@@ -236,7 +236,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
 		return nil, err
 	}
 
-	if setting.MailService.B64EmbedImages {
+	if setting.MailService.Base64EmbedImages {
 		bodyStr := string(body)
 		bodyStr, err = inlineImages(bodyStr, ctx)
 		if err != nil {