diff options
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index e719153a..99b968c8 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -48,12 +48,13 @@ var ( BuildGitHash string // App settings - AppVer string - AppName string - AppUrl string - AppSubUrl string - AppPath string - AppDataPath = "data" + AppVer string + AppName string + AppUrl string + AppSubUrl string + AppSubUrlDepth int // Number of slashes + AppPath string + AppDataPath = "data" // Server settings Protocol Scheme @@ -117,6 +118,7 @@ var ( // Markdown sttings Markdown struct { EnableHardLineBreak bool + CustomURLSchemes []string `ini:"CUSTOM_URL_SCHEMES"` } // Picture settings @@ -299,7 +301,9 @@ func NewContext() { if err != nil { log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err) } + // Suburl should start with '/' and end without '/', such as '/{subpath}'. AppSubUrl = strings.TrimSuffix(url.Path, "/") + AppSubUrlDepth = strings.Count(AppSubUrl, "/") Protocol = HTTP if sec.Key("PROTOCOL").String() == "https" { @@ -415,7 +419,7 @@ func NewContext() { case "duoshuo": GravatarSource = "http://gravatar.duoshuo.com/avatar/" case "gravatar": - GravatarSource = "//1.gravatar.com/avatar/" + GravatarSource = "https://secure.gravatar.com/avatar/" default: GravatarSource = source } @@ -428,7 +432,7 @@ func NewContext() { log.Fatal(4, "Fail to map Markdown settings: %v", err) } else if err = Cfg.Section("git").MapTo(&Git); err != nil { log.Fatal(4, "Fail to map Git settings: %v", err) - } else if Cfg.Section("cron").MapTo(&Cron); err != nil { + } else if err = Cfg.Section("cron").MapTo(&Cron); err != nil { log.Fatal(4, "Fail to map Cron settings: %v", err) } |