Fix GetPage Params case issue

Fixes gohugoio#5946
bep · Nov 21, 2019 · c6ea092 · c6ea092
1 parent 86a7aee
commit c6ea092
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/hugolib/case_insensitive_test.go b/hugolib/case_insensitive_test.go
@@ -179,6 +179,10 @@ Site Title: {{ .Site.Title }}
 Site Lang Mood: {{ .Site.Language.Params.MOoD }}
 Page Colors: {{ .Params.COLOR }}|{{ .Params.Colors.Blue }}
 Site Colors: {{ .Site.Params.COLOR }}|{{ .Site.Params.COLORS.YELLOW }}
+{{ $page2 := .Site.GetPage "/sect2/page2" }}
+{{ if $page2 }}
+Page2: {{ $page2.Params.ColoR }} 
+{{ end }}
 {{ .Content }}
 {{ partial "partial.html" . }}
 `)
@@ -207,6 +211,7 @@ Site Colors: {{ .Site.Params.COLOR }}|{{ .Site.Params.COLORS.YELLOW }}
 		"Page Title: Side 1",
 		"Site Title: Nynorsk title",
 		"&laquo;Hi&raquo;", // angled quotes
+		"Page2: black ",
 	)
 
 	th.assertFileContent(filepath.Join("public", "en", "sect1", "page1", "index.html"),

diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
@@ -743,7 +743,7 @@ func (th testHelper) assertFileContent(filename string, matches ...string) {
 	content := readDestination(th, th.Fs, filename)
 	for _, match := range matches {
 		match = th.replaceDefaultContentLanguageValue(match)
-		th.Assert(strings.Contains(content, match), qt.Equals, true)
+		th.Assert(strings.Contains(content, match), qt.Equals, true, qt.Commentf(content))
 	}
 }
 

diff --git a/tpl/tplimpl/template_ast_transformers.go b/tpl/tplimpl/template_ast_transformers.go
@@ -508,8 +508,7 @@ func (d decl) resolveVariables(idents []string) ([]string, bool) {
 		}
 
 		if !d.isKeyword(replacement) {
-			// This can not be .Site.Params etc.
-			return nil, false
+			continue
 		}
 
 		replacement = strings.TrimPrefix(replacement, ".")

diff --git a/tpl/tplimpl/template_ast_transformers_test.go b/tpl/tplimpl/template_ast_transformers_test.go
@@ -35,7 +35,7 @@ func (p paramsHolder) Params() map[string]interface{} {
 	return p.params
 }
 
-func (p paramsHolder) GetPage() *paramsHolder {
+func (p paramsHolder) GetPage(arg string) *paramsHolder {
 	return p.page
 }
 
@@ -200,10 +200,10 @@ PARAMS SITE GLOBAL1: {{ site.Params.LOwER }}
 PARAMS SITE GLOBAL2: {{ $lower }}
 PARAMS SITE GLOBAL3: {{ $site.Params.LOWER }}
 
-{{ $p := $site.GetPage }}
-PARAMS GETPAGE {{ $p.Params.LOWER }}
-{{ $p := .Site2.GetPage }}
-PARAMS GETPAGE2 {{ $p.Params.LOWER }}
+{{ $p := $site.GetPage "foo" }}
+PARAMS GETPAGE: {{ $p.Params.LOWER }}
+{{ $p := .Site2.GetPage "foo" }}
+PARAMS GETPAGE2: {{ $p.Params.LOWER }}
 `
 )
 
@@ -283,8 +283,8 @@ func TestParamsKeysToLower(t *testing.T) {
 	c.Assert(result, qt.Contains, "PARAMS SITE GLOBAL3: global-site")
 
 	//
-	c.Assert(result, qt.Contains, "PARAMS GETPAGE page")
-	c.Assert(result, qt.Contains, "PARAMS GETPAGE2 page")
+	c.Assert(result, qt.Contains, "PARAMS GETPAGE: page")
+	c.Assert(result, qt.Contains, "PARAMS GETPAGE2: page")
 
 }