Changes how template file name case insensitivity is handled to address issue revel#729

brendensoares · brendensoares · commit d48c7b09f394 · 2014-10-07T23:38:13.000-07:00
diff --git a/template.go b/template.go
@@ -270,8 +270,7 @@ func (loader *TemplateLoader) Refresh() *Error {
 
 			var fileStr string
 
-			// addTemplate allows the same template to be added multiple
-			// times with different template names.
+			// addTemplate loads a template file into the Go template loader so it can be rendered later
 			addTemplate := func(templateName string) (err error) {
 				TRACE.Println("adding template: ", templateName)
 				// Convert template names to use forward slashes, even on Windows.
@@ -339,11 +338,7 @@ func (loader *TemplateLoader) Refresh() *Error {
 
 			templateName := path[len(fullSrcDir)+1:]
 
-			// Lower case the file name for case-insensitive matching
-			lowerCaseTemplateName := strings.ToLower(templateName)
-
 			err = addTemplate(templateName)
-			err = addTemplate(lowerCaseTemplateName)
 
 			// Store / report the first error encountered.
 			if err != nil && loader.compileError == nil {
@@ -411,8 +406,13 @@ func parseTemplateError(err error) (templateName string, line int, description s
 // An Error is returned if there was any problem with any of the templates.  (In
 // this case, if a template is returned, it may still be usable.)
 func (loader *TemplateLoader) Template(name string) (Template, error) {
-	// Lower case the file name to support case-insensitive matching
+	// Case-insensitive matching of template file name
 	name = strings.ToLower(name)
+	for k := range loader.templatePaths {
+		if name == strings.ToLower(k) {
+			name = k
+		}
+	}
 	// Look up and return the template.
 	tmpl := loader.templateSet.Lookup(name)
 
