lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 18:11:29 +00:00
Code Issues Releases Activity

Merge pull request #287 from francoishill/patch-1

Browse Source 
Update template.go
This commit is contained in:
astaxie 2013-11-12 16:15:53 -08:00
commit 6632c21d62
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
template.go
View File

@ -153,7 +153,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
if err != nil { if err != nil {
return nil, [][]string{}, err return nil, [][]string{}, err
} }
reg := regexp.MustCompile("{{[ ]*template[ ]+\"([^\"]+)\"") reg := regexp.MustCompile(TemplateLeft + "[ ]*template[ ]+\"([^\"]+)\"")
allsub := reg.FindAllStringSubmatch(string(data), -1) allsub := reg.FindAllStringSubmatch(string(data), -1)
for _, m := range allsub { for _, m := range allsub {
if len(m) == 2 { if len(m) == 2 {
@ -216,7 +216,7 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others
if err != nil { if err != nil {
continue continue
} }
reg := regexp.MustCompile("{{[ ]*define[ ]+\"([^\"]+)\"") reg := regexp.MustCompile(TemplateLeft + "[ ]*define[ ]+\"([^\"]+)\"")
allsub := reg.FindAllStringSubmatch(string(data), -1) allsub := reg.FindAllStringSubmatch(string(data), -1)
for _, sub := range allsub { for _, sub := range allsub {
if len(sub) == 2 && sub[1] == m[1] { if len(sub) == 2 && sub[1] == m[1] {