Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

1 files changed, 7 insertions, 1 deletions

diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index 0e544fe4..065e1b1e 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -34,7 +34,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
 		var err error
 		ctx.Org.Organization, err = models.GetUserByName(orgName)
 		if err != nil {
-			if err == models.ErrUserNotExist {
+			if models.IsErrUserNotExist(err) {
 				ctx.Handle(404, "GetUserByName", err)
 			} else if redirect {
 				log.Error(4, "GetUserByName", err)
@@ -47,6 +47,12 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
 		org := ctx.Org.Organization
 		ctx.Data["Org"] = org
 
+		// Force redirection when username is actually a user.
+		if !org.IsOrganization() {
+			ctx.Redirect("/" + org.Name)
+			return
+		}
+
 		if ctx.IsSigned {
 			ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id)
 			if ctx.Org.IsOwner {