Browse Source

#3577 incorrect URL produced by AvatarLink

release/v0.9
Unknwon 6 years ago
parent
commit
c50d59874d
No known key found for this signature in database GPG Key ID: FB9F411CDD69BEC1
  1. 2
      models/user.go
  2. 2
      templates/repo/editor/commit_form.tmpl

2
models/user.go

@ -271,7 +271,7 @@ func (u *User) RelAvatarLink() string {
func (u *User) AvatarLink() string {
link := u.RelAvatarLink()
if link[0] == '/' && link[1] != '/' {
return setting.AppUrl + link[1:]
return setting.AppUrl + strings.TrimPrefix(link, setting.AppSubUrl)[1:]
}
return link
}

2
templates/repo/editor/commit_form.tmpl

@ -1,5 +1,5 @@
<div class="commit-form-wrapper">
<img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.AvatarLink}}">
<img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.RelAvatarLink}}">
<div class="commit-form">
<h3>{{.i18n.Tr "repo.editor.commit_changes"}}</h3>
<div class="field">

Loading…
Cancel
Save