Merge branch 'release/v1.5' into backport/fix-wrong-wiki-image-path

This commit is contained in:
Jonas Franz 2018-07-06 19:43:27 +02:00 committed by GitHub
commit 95f0afcd5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -133,7 +133,7 @@ func IsMember(ctx *context.APIContext) {
ctx.Error(500, "IsOrgMember", err)
return
} else if userIsMember {
userToCheckIsMember, err := ctx.Org.Organization.IsOrgMember(ctx.User.ID)
userToCheckIsMember, err := ctx.Org.Organization.IsOrgMember(userToCheck.ID)
if err != nil {
ctx.Error(500, "IsOrgMember", err)
} else if userToCheckIsMember {