@@ -15,6 +15,7 @@ import (
15
15
"code.gitea.io/gitea/modules/git"
16
16
"code.gitea.io/gitea/modules/log"
17
17
"code.gitea.io/gitea/modules/sync"
18
+ "code.gitea.io/gitea/modules/util"
18
19
19
20
"github.com/unknwon/com"
20
21
)
25
26
)
26
27
27
28
func nameAllowed (name string ) error {
28
- for _ , reservedName := range reservedWikiNames {
29
- if name == reservedName {
30
- return models.ErrWikiReservedName {
31
- Title : name ,
32
- }
29
+ if util .IsStringInSlice (name , reservedWikiNames ) {
30
+ return models.ErrWikiReservedName {
31
+ Title : name ,
33
32
}
34
33
}
35
34
return nil
@@ -140,11 +139,9 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
140
139
log .Error ("%v" , err )
141
140
return err
142
141
}
143
- for _ , file := range filesInIndex {
144
- if file == newWikiPath {
145
- return models.ErrWikiAlreadyExist {
146
- Title : newWikiPath ,
147
- }
142
+ if util .IsStringInSlice (newWikiPath , filesInIndex ) {
143
+ return models.ErrWikiAlreadyExist {
144
+ Title : newWikiPath ,
148
145
}
149
146
}
150
147
} else {
@@ -154,14 +151,8 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
154
151
log .Error ("%v" , err )
155
152
return err
156
153
}
157
- found := false
158
- for _ , file := range filesInIndex {
159
- if file == oldWikiPath {
160
- found = true
161
- break
162
- }
163
- }
164
- if found {
154
+
155
+ if util .IsStringInSlice (oldWikiPath , filesInIndex ) {
165
156
err := gitRepo .RemoveFilesFromIndex (oldWikiPath )
166
157
if err != nil {
167
158
log .Error ("%v" , err )
0 commit comments