Commit 206f7368 authored by astaxie's avatar astaxie Committed by GitHub

Merge pull request #2496 from eyalpost/develop

Don't panic during AddViewPath if adding the same path twice
parents 46f3ea4f 24d4a278
......@@ -72,7 +72,7 @@ func ExecuteViewPathTemplate(wr io.Writer, name string, viewPath string, data in
}
panic("can't find templatefile in the path:" + viewPath + "/" + name)
}
panic("Uknown view path:" + viewPath)
panic("Unknown view path:" + viewPath)
}
func init() {
......@@ -165,6 +165,9 @@ func AddTemplateExt(ext string) {
//will panic if called after beego.Run()
func AddViewPath(viewPath string) error {
if beeViewPathTemplateLocked {
if _, exist := beeViewPathTemplates[viewPath]; exist {
return nil //Ignore if viewpath already exists
}
panic("Can not add new view paths after beego.Run()")
}
beeViewPathTemplates[viewPath] = make(map[string]*template.Template)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment