Make absURL properly handle baseURL with path component

diff --git a/helpers/url.go b/helpers/url.go
index bebcb8663467fb5a3486a4bd99f4dcd7869420db..749b2eeacfc73fc8b3001feebe1de78ca5f4009c 100644 (file)
--- a/helpers/url.go
+++ b/helpers/url.go
@@ -151,7 +151,17 @@ func AbsURL(path string) string {
        if strings.HasPrefix(path, "http") || strings.HasPrefix(path, "//") {
                return path
        }
-       return MakePermalink(viper.GetString("BaseURL"), path).String()
+
+       baseURL := viper.GetString("BaseURL")
+       if strings.HasPrefix(path, "/") {
+               p, err := url.Parse(baseURL)
+               if err != nil {
+                       panic(err)
+               }
+               p.Path = ""
+               baseURL = p.String()
+       }
+       return MakePermalink(baseURL, path).String()
 }
 
 // RelURL creates a URL relative to the BaseURL root.

diff --git a/helpers/url_test.go b/helpers/url_test.go
index c484a99a6cf85bea234c865f0d3799308be935ac..4774accbb9b4be5915d95b8f04462c0f0b571924 100644 (file)
--- a/helpers/url_test.go
+++ b/helpers/url_test.go
@@ -53,6 +53,8 @@ func TestAbsURL(t *testing.T) {
                {"/test/2/foo/", "http://base", "http://base/test/2/foo/"},
                {"http://abs", "http://base/", "http://abs"},
                {"//schemaless", "http://base/", "//schemaless"},
+               {"test/2/foo/", "http://base/path", "http://base/path/test/2/foo/"},
+               {"/test/2/foo/", "http://base/path", "http://base/test/2/foo/"},
        }
 
        for _, test := range tests {