github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl: Fix echoParam

Browse source 
Fixes #2406
This commit is contained in:
Bjørn Erik Pedersen 2016-09-07 22:03:09 +03:00
parent a00edff5b1
commit 34fe5cd34f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tpl/template_funcs.go
View file

@ -1178,6 +1178,12 @@ func returnWhenSet(a, k interface{}) interface{} {
} }
} }
avv, isNil = indirect(avv)
if isNil {
return ""
}
if avv.IsValid() { if avv.IsValid() {
switch avv.Kind() { switch avv.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:

4
tpl/template_funcs_test.go
View file

@ -94,6 +94,7 @@ chomp: {{chomp "<p>Blockhead</p>\n" }}
dateFormat: {{ dateFormat "Monday, Jan 2, 2006" "2015-01-21" }} dateFormat: {{ dateFormat "Monday, Jan 2, 2006" "2015-01-21" }}
delimit: {{ delimit (slice "A" "B" "C") ", " " and " }} delimit: {{ delimit (slice "A" "B" "C") ", " " and " }}
div: {{div 6 3}} div: {{div 6 3}}
echoParam: {{ echoParam .Params "langCode" }}
emojify: {{ "I :heart: Hugo" | emojify }} emojify: {{ "I :heart: Hugo" | emojify }}
eq: {{ if eq .Section "blog" }}current{{ end }} eq: {{ if eq .Section "blog" }}current{{ end }}
findRE: {{ findRE "[G|g]o" "Hugo is a static side generator written in Go." 1 }} findRE: {{ findRE "[G|g]o" "Hugo is a static side generator written in Go." 1 }}
@ -162,6 +163,7 @@ chomp: <p>Blockhead</p>
dateFormat: Wednesday, Jan 21, 2015 dateFormat: Wednesday, Jan 21, 2015
delimit: A, B and C delimit: A, B and C
div: 2 div: 2
echoParam: en
emojify: I ❤️ Hugo emojify: I ❤️ Hugo
eq: current eq: current
findRE: [go] findRE: [go]
@ -223,10 +225,12 @@ urlize: bat-man
var data struct { var data struct {
Title string Title string
Section string Section string
Params map[string]interface{}
} }
data.Title = "**BatMan**" data.Title = "**BatMan**"
data.Section = "blog" data.Section = "blog"
data.Params = map[string]interface{}{"langCode": "en"}
viper.Set("baseURL", "http://mysite.com/hugo/") viper.Set("baseURL", "http://mysite.com/hugo/")