summaryrefslogtreecommitdiffhomepage
path: root/hugolib
diff options
context:
space:
mode:
authorHelder Pereira <[email protected]>2020-06-17 00:05:53 +0100
committerBjørn Erik Pedersen <[email protected]>2020-06-17 10:52:35 +0200
commit9679023f2b0d7c55b70f23fd94603f301a841079 (patch)
treef98094f076252dd864732f24c20e94c4fde73546 /hugolib
parent0a9172672a7f2ed85cf675c96bd01b64641256bb (diff)
downloadhugo-9679023f2b0d7c55b70f23fd94603f301a841079.tar.gz
hugo-9679023f2b0d7c55b70f23fd94603f301a841079.zip
Fix aliases with path in baseURL
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/alias_test.go1
-rw-r--r--hugolib/site_render.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go
index a1736e7e8..8f3b756ec 100644
--- a/hugolib/alias_test.go
+++ b/hugolib/alias_test.go
@@ -52,6 +52,7 @@ func TestAlias(t *testing.T) {
settings map[string]interface{}
}{
{"/index.html", "http://example.com", "/", map[string]interface{}{"baseURL": "http://example.com"}},
+ {"/index.html", "http://example.com/some/path", "/", map[string]interface{}{"baseURL": "http://example.com/some/path"}},
{"/index.html", "http://example.com", "/", map[string]interface{}{"baseURL": "http://example.com", "canonifyURLs": true}},
{"/index.html", "../..", "/", map[string]interface{}{"relativeURLs": true}},
{".html", "", ".html", map[string]interface{}{"uglyURLs": true}},
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index 1d397dafa..88b5e6fb7 100644
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -338,7 +338,7 @@ func (s *Site) renderAliases() error {
if isRelative {
// Make alias relative, where "." will be on the
// same directory level as the current page.
- basePath := path.Join(of.RelPermalink(), "..")
+ basePath := path.Join(p.targetPaths().SubResourceBaseLink, "..")
a = path.Join(basePath, a)
} else {