tpl/urls: Retain query and fragment with absURL and absLangURL

Closes #11772

diff --git a/common/paths/url.go b/common/paths/url.go
index cefefdf11b7b0fdb22c9ba4173c5d0645aaa31b3..093ba9ff7fadc4bf293c4c7fba58ce0700ecec6c 100644 (file)
--- a/common/paths/url.go
+++ b/common/paths/url.go
@@ -71,6 +71,8 @@ func MakePermalink(host, plink string) *url.URL {
        }
 
        base.Path = path.Join(base.Path, p.Path)
+       base.Fragment = p.Fragment
+       base.RawQuery = p.RawQuery
 
        // path.Join will strip off the last /, so put it back if it was there.
        hadTrailingSlash := (plink == "" && strings.HasSuffix(host, "/")) || strings.HasSuffix(p.Path, "/")

diff --git a/common/paths/url_test.go b/common/paths/url_test.go
index 4e5f7305389c9c7d5d9e9e97c5d6862c148af73e..5a9233c26faa2081e6715015bbb9d774704c1f97 100644 (file)
--- a/common/paths/url_test.go
+++ b/common/paths/url_test.go
@@ -31,6 +31,7 @@ func TestMakePermalink(t *testing.T) {
                {"http://abc.com", "bar", "http://abc.com/bar"},
                {"http://abc.com/foo/bar", "post/bar", "http://abc.com/foo/bar/post/bar"},
                {"http://abc.com/foo/bar", "post/bar/", "http://abc.com/foo/bar/post/bar/"},
+               {"http://abc.com/foo", "post/bar?a=b#c", "http://abc.com/foo/post/bar?a=b#c"},
        }
 
        for i, d := range data {