fix panic in tests

go-gitea · Dec 9, 2018 · d09b47d · d09b47d
1 parent 9368cfc
commit d09b47d
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/routers/user/profile.go b/routers/user/profile.go
@@ -235,17 +235,7 @@ func Profile(ctx *context.Context) {
 		}
 	}
 
-	var showEmail bool
-
-	if len(ctxUser.Email) > 0 && ctx.IsSigned && !ctxUser.KeepEmailPrivate {
-		showEmail = true
-	} else if ctx.IsSigned {
-		// Show email if the authenticated user owns the profile
-		// being viewed
-		showEmail = ctxUser.ID == ctx.User.ID
-	}
-
-	ctx.Data["ShowUserEmail"] = showEmail
+	ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID)
 
 	ctx.HTML(200, tplProfile)
 }