lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-12-23 11:20:50 +00:00
Code Issues Releases Activity

Merge pull request #1581 from hbejgel/patch-2

Browse Source 
Checks if index is greater than the length of the wildcards. #1580
This commit is contained in:
astaxie 2016-01-23 23:01:22 +08:00
commit fd7473466b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tree.go
View File

@ -420,7 +420,11 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b
if len(strs) == 2 { if len(strs) == 2 {
ctx.Input.SetParam(":ext", strs[1]) ctx.Input.SetParam(":ext", strs[1])
} }
ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[index:len(wildcardValues)-1]...), strs[0])) if index > (len(wildcardValues) - 1) {
ctx.Input.SetParam(":path", "")
} else {
ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[index:len(wildcardValues)-1]...), strs[0]))
}
return true return true
} }
// match :id // match :id