diff options
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index fcb234ad..3936546c 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 @@ -299,7 +300,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 +418,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 } |