String fixes

unfoldingWord · Mar 5, 2016 · 2ae73a8 · 2ae73a8
1 parent 1929e2a
commit 2ae73a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/models/org.go b/models/org.go
@@ -1080,7 +1080,7 @@ func (org *User) GetUserRepositories(userID int64) (err error) {
 		Join("INNER", "`team_repo`", "`team_repo`.repo_id=`repository`.id").
 		Where("`repository`.owner_id=?", org.Id).
 		And("`repository`.is_private=?", false).
-		Or("`team_repo`.team_id=(?)", strings.Join(teamIDs, ",")).
+		Or("`team_repo`.team_id IN ("+strings.Join(teamIDs, ",")+")").
 		GroupBy("`repository`.id").
 		Find(&org.Repos); err != nil {
 		return fmt.Errorf("GetUserRepositories: get repositories: %v", err)

diff --git a/routers/user/auth.go b/routers/user/auth.go
@@ -84,7 +84,7 @@ func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
 
 	if len(u.Salt) <= 8 {
 		// This is for our old Dokuwiki users who are using smd5 password hashing. Want them to change password so it is PBRDF2 hasing
-		ctx.Flash.Error("You need to update your password. Please change your password before proceding further.")
+		ctx.Flash.Error("You need to update your password to use the new Door43. Please update your password before proceeding further.")
 		ctx.Redirect(setting.AppSubUrl + "/user/settings/password")
 	} else {
 		ctx.Redirect(setting.AppSubUrl + "/")