Merge pull request #38 from mattermost/feedback-email-fix
Defaulting to domain of localhost when no domain is given HELIUM
Этот коммит содержится в:
@@ -221,6 +221,10 @@ func LoadConfig(fileName string) {
|
|||||||
// Grabs the domain from enviroment variable if not in configuration
|
// Grabs the domain from enviroment variable if not in configuration
|
||||||
if config.ServiceSettings.Domain == "" {
|
if config.ServiceSettings.Domain == "" {
|
||||||
config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
|
config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
|
||||||
|
// If the enviroment variable is not set, use a default
|
||||||
|
if config.ServiceSettings.Domain == "" {
|
||||||
|
config.ServiceSettings.Domain = "localhost"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for a valid email for feedback, if not then do feedback@domain
|
// Check for a valid email for feedback, if not then do feedback@domain
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user