mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-12 20:13:59 +02:00
Revert " Fix handling of taxonomy terms containing slashes"
See #4090
See #5571
This reverts commit fff132537b
.
This commit is contained in:
@@ -77,17 +77,6 @@ func (filepathBridge) Separator() string {
|
||||
|
||||
var fpb filepathBridge
|
||||
|
||||
// segmentReplacer replaces some URI-reserved characters in a path segments.
|
||||
var segmentReplacer = strings.NewReplacer("/", "-", "#", "-")
|
||||
|
||||
// MakeSegment returns a copy of string s that is appropriate for a path
|
||||
// segment. MakeSegment is similar to MakePath but disallows the '/' and
|
||||
// '#' characters because of their reserved meaning in URIs.
|
||||
func (p *PathSpec) MakeSegment(s string) string {
|
||||
return p.MakePathSanitized(segmentReplacer.Replace(s))
|
||||
|
||||
}
|
||||
|
||||
// MakePath takes a string with any characters and replace it
|
||||
// so the string could be used in a path.
|
||||
// It does so by creating a Unicode-sanitized string, with the spaces replaced,
|
||||
|
@@ -36,39 +36,6 @@ import (
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
func TestMakeSegment(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{" FOO bar ", "foo-bar"},
|
||||
{"Foo.Bar/fOO_bAr-Foo", "foo.bar-foo_bar-foo"},
|
||||
{"FOO,bar:FooBar", "foobarfoobar"},
|
||||
{"foo/BAR.HTML", "foo-bar.html"},
|
||||
{"трям/трям", "трям-трям"},
|
||||
{"은행", "은행"},
|
||||
{"Say What??", "say-what"},
|
||||
{"Your #1 Fan", "your-1-fan"},
|
||||
{"Red & Blue", "red-blue"},
|
||||
{"double//slash", "double-slash"},
|
||||
{"triple///slash", "triple-slash"},
|
||||
{"-my/way-", "my-way"},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
v := newTestCfg()
|
||||
|
||||
l := langs.NewDefaultLanguage(v)
|
||||
p, err := NewPathSpec(hugofs.NewMem(v), l)
|
||||
require.NoError(t, err)
|
||||
|
||||
output := p.MakeSegment(test.input)
|
||||
if output != test.expected {
|
||||
t.Errorf("Expected %#v, got %#v\n", test.expected, output)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMakePath(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
|
Reference in New Issue
Block a user