shithub: hugo

Download patch

ref: 0afa2897a0cf90f4348929ef432202efddc183a0
parent: f219ac09f6b7e26d84599401512233d77c1bdb4c
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Jul 31 07:27:50 EDT 2018 

tpl/partials: Remove superflous loop

No need to check the themes template prefix.


--- a/tpl/partials/partials.go
+++ b/tpl/partials/partials.go
@@ -74,36 +74,35 @@
 		context = contextList[0]
 	}
 
-	for _, n := range []string{"partials/" + name, "theme/partials/" + name} {
-		templ, found := ns.deps.Tmpl.Lookup(n)
+	n := "partials/" + name
+	templ, found := ns.deps.Tmpl.Lookup(n)
 
-		if !found {
-			// For legacy reasons.
-			templ, found = ns.deps.Tmpl.Lookup(n + ".html")
+	if !found {
+		// For legacy reasons.
+		templ, found = ns.deps.Tmpl.Lookup(n + ".html")
+	}
+	if found {
+		b := bp.GetBuffer()
+		defer bp.PutBuffer(b)
+
+		if err := templ.Execute(b, context); err != nil {
+			return "", err
 		}
-		if found {
-			b := bp.GetBuffer()
-			defer bp.PutBuffer(b)
 
-			if err := templ.Execute(b, context); err != nil {
-				return "", err
-			}
-
-			if _, ok := templ.(*texttemplate.Template); ok {
-				s := b.String()
-				if ns.deps.Metrics != nil {
-					ns.deps.Metrics.TrackValue(n, s)
-				}
-				return s, nil
-			}
-
+		if _, ok := templ.(*texttemplate.Template); ok {
 			s := b.String()
 			if ns.deps.Metrics != nil {
 				ns.deps.Metrics.TrackValue(n, s)
 			}
-			return template.HTML(s), nil
+			return s, nil
+		}
 
+		s := b.String()
+		if ns.deps.Metrics != nil {
+			ns.deps.Metrics.TrackValue(n, s)
 		}
+		return template.HTML(s), nil
+
 	}
 
 	return "", fmt.Errorf("Partial %q not found", name)