summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/user.go2
-rw-r--r--templates/repo/editor/commit_form.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/models/user.go b/models/user.go
index ef769de655..946c6c94d4 100644
--- a/models/user.go
+++ b/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
}
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl
index d76f3fb1c2..96b0dcbd3d 100644
--- a/templates/repo/editor/commit_form.tmpl
+++ b/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">