Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-03 00:02:43 +02:00
Code Issues Activity

#3393 fix missing sub-url prefix in relative avatar link

Browse Source
This commit is contained in:
Unknwon committed 2016-08-07 10:13:05 -07:00
1 parent 2772791fda
commit ec92565f23
8 files changed
+32 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+1 -1
View File
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current tip version: 0.9.64 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) ##### Current tip version: 0.9.65 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|
gogs.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.64.0805" const APP_VER = "0.9.65.0806"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
models/pull.go
+1 -1
View File
@@ -246,7 +246,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
Sender: &api.PayloadUser{ Sender: &api.PayloadUser{
UserName: doer.Name, UserName: doer.Name,
ID: doer.ID, ID: doer.ID,
AvatarUrl: setting.AppUrl + doer.RelAvatarLink(), AvatarUrl: doer.AvatarLink(),
}, },
} }
if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil { if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
models/user.go
+6 -3
View File
@@ -230,8 +230,11 @@ func (u *User) GenerateRandomAvatar() error {
return nil return nil
} }
// RelAvatarLink returns relative avatar link to the site domain,
// which includes app sub-url as prefix. However, it is possible
// to return full URL if user enables Gravatar-like service.
func (u *User) RelAvatarLink() string { func (u *User) RelAvatarLink() string {
defaultImgUrl := "/img/avatar_default.png" defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.png"
if u.ID == -1 { if u.ID == -1 {
return defaultImgUrl return defaultImgUrl
} }
@@ -241,7 +244,7 @@ func (u *User) RelAvatarLink() string {
if !com.IsExist(u.CustomAvatarPath()) { if !com.IsExist(u.CustomAvatarPath()) {
return defaultImgUrl return defaultImgUrl
} }
return "/avatars/" + com.ToStr(u.ID) return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
case setting.DisableGravatar, setting.OfflineMode: case setting.DisableGravatar, setting.OfflineMode:
if !com.IsExist(u.CustomAvatarPath()) { if !com.IsExist(u.CustomAvatarPath()) {
if err := u.GenerateRandomAvatar(); err != nil { if err := u.GenerateRandomAvatar(); err != nil {
@@ -249,7 +252,7 @@ func (u *User) RelAvatarLink() string {
} }
} }
return "/avatars/" + com.ToStr(u.ID) return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
} }
return setting.GravatarSource + u.Avatar return setting.GravatarSource + u.Avatar
} }
modules/bindata/bindata.go
+20 -20
View File
@@ -286,7 +286,7 @@ func (fi bindataFileInfo) Sys() interface{} {
return nil return nil
} }
var _confAppIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\x5a\x5b\x6f\x23\x47\x76\x7e\xef\x5f\x51\x96\xe3\x8c\x26\x68\x92\xba\x8c\x34\xb2\xbc\xda\x98\x22\x9b\x12\x77\x78\xdb\x6e\x6a\xc6\xe3\x81\xd0\x6a\xb1\x8b\x64\x5b\xcd\x6e\xba\xab\x29\x8d\x8c\x20\xd8\x45\x1e\x72\x01\x82\x3c\x24\x48\x10\x20\x08\x92\x87\x64\x81\xcd\x6d\x17\x79\xd9\x4d\x9c\xbc\x38\x79\x1f\xff\x87\x8d\x37\xfb\xb4\x7f\x21\xdf\x39\x55\x4d\x36\x35\xb2\x36\x06\x12\x5f\xc4\xbe\x54\x9d\x3a\x75\xae\xdf\x39\xd5\xef\x8a\x9e\xf3\xdc\x71\x05\xff\xe9\xf6\x9b\xed\xd6\x4b\x31\x3c\x6d\x7b\xa2\xd5\xee\x38\xd6\xbb\x62\xd0\x71\xea\x9e\x23\xba\xf5\x67\x8e\x68\x9c\xd6\x7b\x27\x8e\x27\xfa\x3d\xd1\xe8\xbb\xae\xe3\x0d\xfa\xbd\x66\xbb\x77\x22\x1a\x67\xde\xb0\xdf\xc5\xc3\x5e\xab\x7d\xa2\x67\x5a\x1f\x88\xfa\x7c\x2e\x92\x60\x26\x45\x3e\x0d\x72\xa1\xa6\xe9\x8d\x12\x69\x22\xe4\xb5\xcc\x6e\xc5\x3c\x98\xe0\x45\x94\xc7\xd2\xaa\x0f\x06\x7e\xaf\xde\x75\xc4\x91\x38\x49\x27\xea\x10\x7f\xc5\x49\x94\x0b\x4f\x66\xd7\xd1\x48\x82\x52\x63\x1a\x24\x18\x8e\x67\xd1\x58\xdc\xa6\x0b\x91\x2d\x12\x11\xa7\xa3\x20\x8e\x6f\x2d\xf7\xac\xe7\x9f\x79\xe0\xfe\x48\x4c\xa2\x1c\xa3\x9d\x28\x9f\xca\x4c\x6c\x84\xf2\x7a\xc3\x16\x1b\xf3\x2c\x0d\x37\x44\x8a\x07\xb9\x54\x39\x9e\x84\x72\x1c\x2c\x62\xd0\x52\x7a\x0c\x53\xc0\xd6\x89\x01\xdc\x5b\xd6\xab\x4c\xce\x53\x15\xe5\x69\x76\x7b\x6e\xb9\xfd\xfe\x50\x1c\x59\x5e\xc3\x6d\x0f\x86\xfe\xf0\xe5\x80\x86\x5d\x06\x6a\x8a\x95\x9a\x86\x52\xbd\xe7\xb5\xc5\x68\x1a\x64\x4a\xe6\x16\xdd\xf8\x10\x95\xeb\x39\x34\xf1\x03\xd1\x4a\xb3\x91\x34\xdb\x4e\xe4\x8d\x58\x51\x17\x79\x2a\x2e\xa5\x98\x67\xd1\x75\x90\x4b\xab\xd5\x77\x1b\x8e\x3f\x70\xdb\xcf\xeb\x43\x5a\x65\x1c\xc4\x8a\xb6\x7f\x12\xa7\x97\x41\x2c\x66\xc1\xeb\x68\xb6\x98\x89\x51\x26\x83\x3c\x82\x24\xe3\x68\x06\x91\xa4\xe3\x32\xc5\x39\x76\xbe\x50\x32\xb3\x45\x65\x5b\xcc\x64\x90\x28\x91\xa4\x7a\xa4\xd5\xad\x7f\xe4\x37\x5c\xa7\x3e\x6c\xf7\x7b\x7e\xa7\xdd\x6d\x83\x3f\x0c\xc3\x0a\x83\x20\x1f\x4d\x05\xc9\x47\x7c\xba\x90\x0b\x29\x62\x99\x4c\xf2\xa9\x8d\x35\xaf\x58\xee\x81\x12\x71\x90\x41\x07\xb8\xc0\x5a\x2a\xba\x84\xe2\x06\x67\x9d\x8e\xef\x3a\xdf\x3d\x73\xbc\xa1\x8f\xbf\x67\x8e\xdf\x71\x7a\x27\xc3\x53\x90\xdd\xde\xc2\x3f\x10\xe5\x22\x3a\x07\xfd\xde\x62\x76\x09\xc6\xca\xac\x46\x52\x69\xc3\x08\x32\xc9\xc6\x21\x43\x11\x25\x30\x10\x88\xea\xf5\x3c\x4e\xf1\x94\x6c\xc4\x72\x3e\x1a\x74\xfa\x2e\xc4\x52\x3f\x81\xa9\xf9\xbd\xb3\x2e\xa8\xef\x6c\xad\x11\x8d\x94\x5a\x7c\x3d\x39\x26\xd3\xf6\xbc\xb3\x3b\x44\xb6\xd7\x89\x2c\xc5\x9b\xce\x20\x2c\x75\x87\x48\x30\xca\xa3\xeb\x28\xbf\x15\x63\x29\x43\xab\xe5\x38\x4d\x9f\xc5\xd9\xef\x42\x8c\x86\xe0\x1e\xe8\x3d\x0f\x62\x88\x0f\xe4\x2e\x60\x84\x33\x59\x19\xa5\xd8\xca\x05\x34\x91\x07\x22\x0f\x26\x36\x29\x27\x14\x97\xb7\xa2\x9e\x84\x59\x1a\x85\xe2\xdb\x98\x57\x25\x4e\xea\x09\xd6\xba\x0e\x62\x3c\xe3\x49\x50\x1a\x64\xbf\x91\x60\x75\x6d\xbe\x61\xa4\x02\x88\x7d\x43\xdc\x44\x71\x2c\xa6\xc1\x35\x79\x96\x5c\x9a\xb3\xca\x6f\x63\xb2\x96\x2e\x89\x2e\x4a\xc6\xe9\xa1\x98\xe6\xf9\x5c\x1d\xd6\x6a\xb0\x6a\x19\xa7\x30\x0d\x55\x9d\xa4\xe9\x24\x96\x55\x6c\xb2\x76\x23\x2f\x6b\x8b\x79\x08\xcb\x53\xb5\x9d\xad\xed\x27\xb5\xed\xed\x9a\xb7\x98\xcf\xd3\x2c\xaf\x8c\xd3\xac\x52\xda\x40\x25\x4a\x2a\x8d\x69\x96\xe2\x7e\xf7\x7d\x7e\x69\xd8\xb7\x86\xa7\x4e\xd7\x81\x18\xa0\x23\xbf\xeb\x0c\xeb\xfe\xb0\x7e\x02\x51\x5c\xbc\x3b\x1e\xef\xed\x3e\xd9\xbd\x20\x86\x82\xd7\x42\x45\x9f\xb1\x54\xc6\x51\x4c\x8a\x62\xb3\xc7\x7e\xe6\x71\x70\x0b\x71\x6c\x9a\x3d\x28\xf2\xc9\x83\x6e\x74\xfc\x98\x6d\xb5\xd9\xf6\x06\x9d\xfa\x4b\x9f\x02\x8a\xef\xb5\x3f\x26\x9f\x38\xd8\x3d\x38\xd8\xdf\x3a\x60\xcb\xaa\x06\xe1\x2c\x4a\xd6\xed\x8b\x6c\xff\x61\x4b\xa0\x58\xb1\x6e\x08\x7b\x5b\x6f\x9b\xe8\x83\x24\x5c\x67\xd0\x7f\x90\x44\x92\xe6\x88\x5c\x0f\x13\xe9\xf5\x87\xed\xc6\x5d\xbb\xde\x5b\x23\x93\x66\x93\x20\x89\x3e\xd3\xde\xfe\x10\xad\xbe\x7b\xf2\x16\x3f\x2c\x21\x12\xc7\x3d\x0e\xf8\x0d\x77\xb7\xbd\x07\x6a\xb3\x20\xbb\x0a\xd3\x1b\x96\xb7\x93\x90\x25\xc2\x06\xb3\x10\x66\x8a\x89\x97\x88\x49\x57\x70\xdc\x5c\x26\x0a\xcc\x5a\x4e\xaf\x7e\x0c\xa5\x21\x0a\x36\x11\x69\x7a\x8e\x7f\x8c\xb8\xf3\xac\x14\xd3\x3a\x91\xe2\xd0\x35\x5a\xa8\x3c\x9d\x89\x33\xb7\x53\xf1\x46\x64\x70\x25\xde\x10\xde\x99\x39\x0a\x3e\x51\x72\xa5\xc4\xcd\x54\x26\xd8\x40\x12\xca\x2c\x4a\x26\x30\x2c\xcd\x11\xc8\xc1\x24\xb1\x7a\x30\x9b\x83\x2b\x64\x01\x7b\x16\x4c\x12\xc4\x62\x9d\x98\x7c\x50\xf7\xbd\x06\x59\xaa\x87\x88\x6c\xbd\x82\x50\xae\x49\x2e\x03\xb7\x3f\xec\xc3\x76\xc1\x17\xb9\x8a\xd5\xec\x77\xeb\xed\x1e\xee\x38\xb7\x4c\x53\x95\x73\xf8\xa7\xf9\x78\xf8\xde\x66\x31\xfe\x31\x39\xd5\x7b\x9b\x7a\x38\x6e\xde\xdb\x3c\x1d\x0e\x07\xfe\xa0\xef\x0e\x1f\xab\x9a\xc5\x37\xf5\x66\x93\x52\xd2\x56\x95\xff\xb5\x96\x03\xf0\x6c\x97\x42\x23\x44\x40\x8b\x88\xcd\x66\xf7\xe3\xc7\xb4\x7f\xde\x03\x25\x40\x71\x93\x66\x57\x64\xc5\x9b\x6a\x81\xa8\x8c\xdd\x7b\xde\xa9\xd0\x9e\xfa\x18\x81\x08\x86\xa5\x68\xfb\xf0\x5f\xa1\x74\x8e\xac\x82\x5c\x3b\x11\x33\x70\x2c\x46\x81\x82\x10\x29\x4b\x86\x29\x19\x22\x72\x0e\x64\x08\x97\x1b\xe9\x2c\x5a\x8e\x19\xd7\x14\xad\x68\x72\x3d\xce\x61\x1e\x94\x4d\x92\xf8\xd6\x64\xd9\x8c\xd7\xd5\xb2\x02\xa1\x50\x92\Line truncated var _confAppIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\x7a\x5b\x6f\x23\x47\x76\xff\x7b\x7f\x8a\xb2\xfc\xf7\x7f\x34\x41\x93\xd4\x65\xa4\x91\xe5\xd5\xc6\x14\xd9\x94\xb8\xc3\xdb\x76\x53\x33\x1e\x0f\x84\x56\x8b\x5d\x24\xdb\x6a\x76\xd3\x5d\x4d\x69\x64\x04\xc1\x2e\xf2\x90\x0b\x10\xe4\x21\x41\x82\x00\x41\x90\x3c\x24\x0b\x6c\x6e\xbb\xc8\xcb\x3a\x71\xf2\xe2\xe4\x7d\xfc\x1d\x36\xde\xec\xd3\x7e\x85\xfc\xce\xa9\x6a\xb2\xa9\x91\x95\x18\x48\x76\x3d\x62\x5f\xaa\x4e\xd5\xb9\xff\xce\xa9\x7e\x57\xf4\x9c\xe7\x8e\x2b\xf8\x4f\xb7\xdf\x6c\xb7\x5e\x8a\xe1\x69\xdb\x13\xad\x76\xc7\xb1\xde\x15\x83\x8e\x53\xf7\x1c\xd1\xad\x3f\x73\x44\xe3\xb4\xde\x3b\x71\x3c\xd1\xef\x89\x46\xdf\x75\x1d\x6f\xd0\xef\x35\xdb\xbd\x13\xd1\x38\xf3\x86\xfd\x2e\x1e\xf6\x5a\xed\x13\x3d\xd3\xfa\x40\xd4\xe7\x73\x91\x04\x33\x29\xf2\x69\x90\x0b\x35\x4d\x6f\x94\x48\x13\x21\xaf\x65\x76\x2b\xe6\xc1\x04\x2f\xa2\x3c\x96\x56\x7d\x30\xf0\x7b\xf5\xae\x23\x8e\xc4\x49\x3a\x51\x87\xf8\x2b\x4e\xa2\x5c\x78\x32\xbb\x8e\x46\x12\x94\x1a\xd3\x20\xc1\x70\x3c\x8b\xc6\xe2\x36\x5d\x88\x6c\x91\x88\x38\x1d\x05\x71\x7c\x6b\xb9\x67\x3d\xff\xcc\xc3\xee\x8f\xc4\x24\xca\x31\xda\x89\xf2\xa9\xcc\xc4\x46\x28\xaf\x37\x6c\xb1\x31\xcf\xd2\x70\x43\xa4\x78\x90\x4b\x95\xe3\x49\x28\xc7\xc1\x22\x06\x2d\xa5\xc7\x30\x05\xb0\x4e\x1b\xc0\xbd\x65\xbd\xca\xe4\x3c\x55\x51\x9e\x66\xb7\xe7\x96\xdb\xef\x0f\xc5\x91\xe5\x35\xdc\xf6\x60\xe8\x0f\x5f\x0e\x68\xd8\x65\xa0\xa6\x58\xa9\x69\x28\xd5\x7b\x5e\x5b\x8c\xa6\x41\xa6\x64\x6e\xd1\x8d\x0f\x51\xb9\x9e\x43\x13\x3f\x10\xad\x34\x1b\x49\xc3\x76\x22\x6f\xc4\x8a\xba\xc8\x53\x71\x29\xc5\x3c\x8b\xae\x83\x5c\x5a\xad\xbe\xdb\x70\xfc\x81\xdb\x7e\x5e\x1f\xd2\x2a\xe3\x20\x56\xc4\xfe\x49\x9c\x5e\x06\xb1\x98\x05\xaf\xa3\xd9\x62\x26\x46\x99\x0c\xf2\x08\x92\x8c\xa3\x19\x44\x92\x8e\xcb\x14\xe7\xe0\x7c\xa1\x64\x66\x8b\xca\xb6\x98\xc9\x20\x51\x22\x49\xf5\x48\xab\x5b\xff\xc8\x6f\xb8\x4e\x7d\xd8\xee\xf7\xfc\x4e\xbb\xdb\xc6\xfe\x30\x0c\x2b\x0c\x82\x7c\x34\x15\x24\x1f\xf1\xe9\x42\x2e\xa4\x88\x65\x32\xc9\xa7\x36\xd6\xbc\x62\xb9\x07\x4a\xc4\x41\x06\x1d\xe0\x02\x6b\xa9\xe8\x12\x8a\x1b\x9c\x75\x3a\xbe\xeb\x7c\xff\xcc\xf1\x86\x3e\xfe\x9e\x39\x7e\xc7\xe9\x9d\x0c\x4f\x41\x76\x7b\x0b\xff\x83\x28\x17\xd1\x39\xe8\xf7\x16\xb3\x4b\x6c\xac\xbc\xd5\x48\x2a\x6d\x18\x41\x26\xd9\x38\x64\x28\xa2\x04\x06\x02\x51\xbd\x9e\xc7\x29\x9e\x92\x8d\x58\xce\x47\x83\x4e\xdf\x85\x58\xea\x27\x30\x35\xbf\x77\xd6\x05\xf5\x9d\xad\x35\xa2\x91\x52\x8b\x6f\x26\xc7\x64\xda\x9e\x77\x76\x87\xc8\xf6\x3a\x91\xa5\x78\xd3\x19\x84\xa5\xee\x10\x09\x46\x79\x74\x1d\xe5\xb7\x62\x2c\x65\x68\xb5\x1c\xa7\xe9\xb3\x38\xfb\x5d\x88\xd1\x10\xdc\x03\xbd\xe7\x41\x0c\xf1\x81\xdc\x05\x8c\x70\x26\x2b\xa3\x14\xac\x5c\x40\x13\x79\x20\xf2\x60\x62\x93\x72\x42\x71\x79\x2b\xea\x49\x98\xa5\x51\x28\xbe\x8b\x79\x55\xda\x49\x3d\xc1\x5a\xd7\x41\x8c\x67\x3c\x09\x4a\x83\xec\x37\x12\xac\xae\xcd\x37\x8c\x54\x00\xb1\x6f\x88\x9b\x28\x8e\xc5\x34\xb8\x26\xcf\x92\x4b\x73\x56\xf9\x6d\x4c\xd6\xd2\x25\xd1\x45\xc9\x38\x3d\x14\xd3\x3c\x9f\xab\xc3\x5a\x0d\x56\x2d\xe3\x14\xa6\xa1\xaa\x93\x34\x9d\xc4\xb2\x0a\x26\x6b\x37\xf2\xb2\xb6\x98\x87\xb0\x3c\x55\xdb\xd9\xda\x7e\x52\xdb\xde\xae\x79\x8b\xf9\x3c\xcd\xf2\xca\x38\xcd\x2a\x25\x06\x2a\x51\x52\x69\x4c\xb3\x14\xf7\xbb\xef\xf3\x4b\xb3\x7d\x6b\x78\xea\x74\x1d\x88\x01\x3a\xf2\xbb\xce\xb0\xee\x0f\xeb\x27\x10\xc5\xc5\xbb\xe3\xf1\xde\xee\x93\xdd\x0b\xda\x50\xf0\x5a\xa8\xe8\x33\x96\xca\x38\x8a\x49\x51\x6c\xf6\xe0\x67\x1e\x07\xb7\x10\xc7\xa6\xe1\x41\x91\x4f\x1e\x74\xa3\xe3\xc7\x6c\xab\xcd\xb6\x37\xe8\xd4\x5f\xfa\x14\x50\x7c\xaf\xfd\x31\xf9\xc4\xc1\xee\xc1\xc1\xfe\xd6\x01\x5b\x56\x35\x08\x67\x51\xb2\x6e\x5f\x64\xfb\x0f\x5b\x02\xc5\x8a\x75\x43\xd8\xdb\x7a\xdb\x44\x1f\x24\xe1\x3a\x83\xfe\x83\x24\x92\x34\x47\xe4\x7a\x98\x48\xaf\x3f\x6c\x37\xee\xda\xf5\xde\x1a\x99\x34\x9b\x04\x49\xf4\x99\xf6\xf6\x87\x68\xf5\xdd\x93\xb7\xf6\xc3\x12\x22\x71\xdc\xe3\x80\xdf\x92\xbb\xed\x3d\x50\x9b\x05\xd9\x55\x98\xde\xb0\xbc\x9d\x84\x2c\x11\x36\x98\x85\x30\x53\x4c\xbc\x44\x4c\xba\x82\xe3\xe6\x32\x51\xd8\xac\xe5\xf4\xea\xc7\x50\x1a\xa2\x60\x13\x91\xa6\xe7\xf8\xc7\x88\x3b\xcf\x4a\x31\xad\x13\x29\x0e\x5d\xa3\x85\xca\xd3\x99\x38\x73\x3b\x15\x6f\x44\x06\x57\xda\x1b\xc2\x3b\x6f\x8e\x82\x4f\x94\x5c\x29\x71\x33\x95\x09\x18\x48\x42\x99\x45\xc9\x04\x86\xa5\x77\x04\x72\x30\x49\xac\x1e\xcc\xe6\xd8\x15\xb2\x80\x3d\x0b\x26\x09\x62\xb1\x4e\x4c\x3e\xa8\xfb\x5e\x83\x2c\xd5\x43\x44\xb6\x5e\x41\x28\xd7\x24\x97\x81\xdb\x1f\xf6\x61\xbb\xd8\x17\xb9\x8a\xd5\xec\x77\xeb\xed\x1e\xee\x38\xb7\x4c\x53\x95\x73\xf8\xa7\xf9\x78\xf8\xde\x66\x31\xfe\x31\x39\xd5\x7b\x9b\x7a\x38\x6e\xde\xdb\x3c\x1d\x0e\x07\xfe\xa0\xef\x0e\x1f\xab\x9a\xc5\x37\xf5\x66\x93\x52\xd2\x56\x95\xff\x6f\x2d\x07\xe0\xd9\x2e\x85\x46\x88\x80\x16\x11\x9b\xcd\xee\xc7\x8f\x89\x7f\xe6\x81\x12\xa0\xb8\x49\xb3\x2b\xb2\xe2\x4d\xb5\x40\x54\x06\xf7\x9e\x77\x2a\xb4\xa7\x3e\x46\x20\x82\x61\x29\x62\x1f\xfe\x2b\x94\xce\x91\x55\x90\x6b\x27\x62\x86\x1d\x8b\x51\xa0\x20\x44\xca\x92\x61\x4a\x86\x88\x9c\x03\x19\xc2\xe5\x46\x3a\x8b\x96\x63\xc6\x35\x45\x2b\x9a\x5c\x8f\x73\x98\x07\x65\x93\x24\xbe\x35\x59\x36\xe3\x75\xb5\xac\x40\x28\Line truncated
func confAppIniBytes() ([]byte, error) { func confAppIniBytes() ([]byte, error) {
return bindataRead( return bindataRead(
@@ -301,7 +301,7 @@ func confAppIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/app.ini", size: 11835, mode: os.FileMode(420), modTime: time.Unix(1469428283, 0)} info := bindataFileInfo{name: "conf/app.ini", size: 11913, mode: os.FileMode(420), modTime: time.Unix(1470588606, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4301,7 +4301,7 @@ func confLocaleLocale_bgBgIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_bg-BG.ini", size: 79008, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_bg-BG.ini", size: 79008, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4321,7 +4321,7 @@ func confLocaleLocale_csCzIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_cs-CZ.ini", size: 54788, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_cs-CZ.ini", size: 54788, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4341,7 +4341,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 55156, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 55156, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4361,7 +4361,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 51599, mode: os.FileMode(420), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 51599, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4381,7 +4381,7 @@ func confLocaleLocale_esEsIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_es-ES.ini", size: 56082, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_es-ES.ini", size: 56082, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4401,7 +4401,7 @@ func confLocaleLocale_fiFiIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_fi-FI.ini", size: 53005, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_fi-FI.ini", size: 53005, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4421,7 +4421,7 @@ func confLocaleLocale_frFrIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_fr-FR.ini", size: 55703, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_fr-FR.ini", size: 55703, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4441,7 +4441,7 @@ func confLocaleLocale_itItIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_it-IT.ini", size: 53702, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_it-IT.ini", size: 53702, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4461,7 +4461,7 @@ func confLocaleLocale_jaJpIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_ja-JP.ini", size: 60855, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_ja-JP.ini", size: 60855, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4481,7 +4481,7 @@ func confLocaleLocale_lvLvIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 56012, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 56012, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4501,7 +4501,7 @@ func confLocaleLocale_nlNlIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_nl-NL.ini", size: 52430, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_nl-NL.ini", size: 52430, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4521,7 +4521,7 @@ func confLocaleLocale_plPlIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_pl-PL.ini", size: 53808, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_pl-PL.ini", size: 53808, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4541,7 +4541,7 @@ func confLocaleLocale_ptBrIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_pt-BR.ini", size: 54262, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_pt-BR.ini", size: 54262, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4561,7 +4561,7 @@ func confLocaleLocale_ruRuIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_ru-RU.ini", size: 78923, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_ru-RU.ini", size: 78923, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4581,7 +4581,7 @@ func confLocaleLocale_trTrIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_tr-TR.ini", size: 54254, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_tr-TR.ini", size: 54254, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4601,7 +4601,7 @@ func confLocaleLocale_zhCnIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 49211, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 49211, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4621,7 +4621,7 @@ func confLocaleLocale_zhHkIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_zh-HK.ini", size: 49210, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_zh-HK.ini", size: 49210, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -4641,7 +4641,7 @@ func confLocaleLocale_zhTwIni() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "conf/locale/locale_zh-TW.ini", size: 49076, mode: os.FileMode(438), modTime: time.Unix(1470252236, 0)} info := bindataFileInfo{name: "conf/locale/locale_zh-TW.ini", size: 49076, mode: os.FileMode(420), modTime: time.Unix(1470456474, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
modules/setting/setting.go
+1
View File
@@ -334,6 +334,7 @@ func NewContext() {
log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err) log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err)
} }
// Suburl should start with '/' and end without '/', such as '/{subpath}'. // Suburl should start with '/' and end without '/', such as '/{subpath}'.
// This value is empty if site does not have sub-url.
AppSubUrl = strings.TrimSuffix(url.Path, "/") AppSubUrl = strings.TrimSuffix(url.Path, "/")
AppSubUrlDepth = strings.Count(AppSubUrl, "/") AppSubUrlDepth = strings.Count(AppSubUrl, "/")
scripts/README
+1
View File
@@ -0,0 +1 @@
All files in subdirectories are templates, do modifications based on your environment first.
templates/.VERSION
+1 -1
View File
@@ -1 +1 @@
0.9.64.0805 0.9.65.0806