Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-07-28 13:31:32 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-07-28 14:03:12 +0300
commite393c6290e827111a8a2e486791dc21f63a92b55 (patch)
tree60675fcabe21cb2aaee98625e2fad4bd53fa5afa /common
parent93d02aabe6e611d65c428a9c5669b422e1bcf5e8 (diff)
common/maps: Do not return error on params dot access on incompatible types
This error was introduced in 0.56 and has shown some site breakage in the wild. Fixes #6121
Diffstat (limited to 'common')
-rw-r--r--common/maps/params.go4
-rw-r--r--common/maps/params_test.go6
2 files changed, 7 insertions, 3 deletions
diff --git a/common/maps/params.go b/common/maps/params.go
index 0b81057b1..2d62ad752 100644
--- a/common/maps/params.go
+++ b/common/maps/params.go
@@ -16,8 +16,6 @@ package maps
import (
"strings"
- "github.com/pkg/errors"
-
"github.com/spf13/cast"
)
@@ -72,7 +70,7 @@ func traverseNestedParams(keySegments []string, lookupFn func(key string) interf
v, key, owner := traverseParams(rest, m)
return v, key, owner, nil
default:
- return nil, "", nil, errors.Errorf("unsupported Params type: %T", result)
+ return nil, "", nil, nil
}
}
diff --git a/common/maps/params_test.go b/common/maps/params_test.go
index 89b149617..7443553f1 100644
--- a/common/maps/params_test.go
+++ b/common/maps/params_test.go
@@ -22,10 +22,14 @@ import (
func TestGetNestedParam(t *testing.T) {
m := map[string]interface{}{
+ "string": "value",
"first": 1,
"with_underscore": 2,
"nested": map[string]interface{}{
"color": "blue",
+ "nestednested": map[string]interface{}{
+ "color": "green",
+ },
},
}
@@ -41,5 +45,7 @@ func TestGetNestedParam(t *testing.T) {
assert.Equal(1, must("First", "_", m))
assert.Equal(2, must("with_underscore", "_", m))
assert.Equal("blue", must("nested_color", "_", m))
+ assert.Equal("green", must("nested.nestednested.color", ".", m))
+ assert.Nil(must("string.name", ".", m))
}