luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-31 11:52:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Show email if the authenticated user owns the profile page being requested for (#4981)

Browse source 
* Show email if the authenticated user owns the profile page being
requested for.

Also removed `setting.UI.ShowUserEmail` as it's documentation says it
only controls the email setting on the explore page

* fix current user check... This prevents a panic as a user must be signed in before ctx.User is called

* fix panic in tests

* try to fix tests

* Update year

* Test CI fail

* Revert change

* User 3 is not allowed to authorize

* Set user2 email to be private

* Change to user4 in explore page as user2 now has private email option set
This commit is contained in:
Lanre Adelowo 2019-02-19 15:11:50 +01:00 • committed by techknowlogick
parent ff2be17e3f
commit 094263db4d
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/user/profile.go
View file

@ -237,7 +237,7 @@ func Profile(ctx *context.Context) {
}
}
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID)
ctx.HTML(200, tplProfile)
}