Fixes #1292

diff --git a/helpers/path.go b/helpers/path.go
index 757cedefb446821cd19662b59c294cfb5149fd4e..bab6c71f9553f33ed392df397c55504df420c982 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -96,7 +96,7 @@ func UnicodeSanitize(s string) string {
        target := make([]rune, 0, len(source))
 
        for _, r := range source {
-               if unicode.IsLetter(r) || unicode.IsDigit(r) || unicode.IsMark(r) || r == '.' || r == '/' || r == '\\' || r == '_' || r == '-' || r == '#' {
+               if unicode.IsLetter(r) || unicode.IsDigit(r) || unicode.IsMark(r) || r == '%' || r == '.' || r == '/' || r == '\\' || r == '_' || r == '-' || r == '#' {
                        target = append(target, r)
                }
        }

diff --git a/helpers/path_test.go b/helpers/path_test.go
index 7718730c6b06d70911ad7dc3673ad3f70ccadc26..53848b0b59d649656ec2b6db14e3284d187e360f 100644 (file)
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -40,13 +40,14 @@ func TestMakePath(t *testing.T) {
        }{
                {"  Foo bar  ", "Foo-bar", true},
                {"Foo.Bar/foo_Bar-Foo", "Foo.Bar/foo_Bar-Foo", true},
-               {"fOO,bar:foo%bAR", "fOObarfoobAR", true},
+               {"fOO,bar:foobAR", "fOObarfoobAR", true},
                {"FOo/BaR.html", "FOo/BaR.html", true},
                {"трям/трям", "трям/трям", true},
                {"은행", "은행", true},
                {"Банковский кассир", "Банковскии-кассир", true},
                // Issue #1488
                {"संस्कृत", "संस्कृत", false},
+               {"a%C3%B1ame", "a%C3%B1ame", false}, // Issue #1292
        }
 
        for _, test := range tests {
@@ -68,7 +69,7 @@ func TestMakePathSanitized(t *testing.T) {
        }{
                {"  FOO bar  ", "foo-bar"},
                {"Foo.Bar/fOO_bAr-Foo", "foo.bar/foo_bar-foo"},
-               {"FOO,bar:Foo%Bar", "foobarfoobar"},
+               {"FOO,bar:FooBar", "foobarfoobar"},
                {"foo/BAR.HTML", "foo/bar.html"},
                {"трям/трям", "трям/трям"},
                {"은행", "은행"},
@@ -93,7 +94,7 @@ func TestMakePathSanitizedDisablePathToLower(t *testing.T) {
        }{
                {"  FOO bar  ", "FOO-bar"},
                {"Foo.Bar/fOO_bAr-Foo", "Foo.Bar/fOO_bAr-Foo"},
-               {"FOO,bar:Foo%Bar", "FOObarFooBar"},
+               {"FOO,bar:FooBar", "FOObarFooBar"},
                {"foo/BAR.HTML", "foo/BAR.HTML"},
                {"трям/трям", "трям/трям"},
                {"은행", "은행"},
@@ -771,6 +772,7 @@ func TestGetTempDir(t *testing.T) {
                {testDir + "  Foo bar  ", dir + testDir + "  Foo bar  " + FilePathSeparator},
                {testDir + "Foo.Bar/foo_Bar-Foo", dir + testDir + "Foo.Bar/foo_Bar-Foo" + FilePathSeparator},
                {testDir + "fOO,bar:foo%bAR", dir + testDir + "fOObarfoo%bAR" + FilePathSeparator},
+               {testDir + "fOO,bar:foobAR", dir + testDir + "fOObarfoobAR" + FilePathSeparator},
                {testDir + "FOo/BaR.html", dir + testDir + "FOo/BaR.html" + FilePathSeparator},
                {testDir + "трям/трям", dir + testDir + "трям/трям" + FilePathSeparator},
                {testDir + "은행", dir + testDir + "은행" + FilePathSeparator},

diff --git a/helpers/url_test.go b/helpers/url_test.go
index 632a0f8a91fbc8640c95a23481e4627917a2e62f..c484a99a6cf85bea234c865f0d3799308be935ac 100644 (file)
--- a/helpers/url_test.go
+++ b/helpers/url_test.go
@@ -28,7 +28,7 @@ func TestURLize(t *testing.T) {
        }{
                {"  foo bar  ", "foo-bar"},
                {"foo.bar/foo_bar-foo", "foo.bar/foo_bar-foo"},
-               {"foo,bar:foo%bar", "foobarfoobar"},
+               {"foo,bar:foobar", "foobarfoobar"},
                {"foo/bar.html", "foo/bar.html"},
                {"трям/трям", "%D1%82%D1%80%D1%8F%D0%BC/%D1%82%D1%80%D1%8F%D0%BC"},
        }