github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix aliases with path in baseURL

Browse source
This commit is contained in:
Helder Pereira 2020-06-17 00:05:53 +01:00 committed by Bjørn Erik Pedersen
parent 0a9172672a
commit 9679023f2b
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hugolib/alias_test.go
View file

@ -52,6 +52,7 @@ func TestAlias(t *testing.T) {
settings map[string]interface{} settings map[string]interface{}
}{ }{
{"/index.html", "http://example.com", "/", map[string]interface{}{"baseURL": "http://example.com"}}, {"/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", "http://example.com", "/", map[string]interface{}{"baseURL": "http://example.com", "canonifyURLs": true}},
{"/index.html", "../..", "/", map[string]interface{}{"relativeURLs": true}}, {"/index.html", "../..", "/", map[string]interface{}{"relativeURLs": true}},
{".html", "", ".html", map[string]interface{}{"uglyURLs": true}}, {".html", "", ".html", map[string]interface{}{"uglyURLs": true}},

2
hugolib/site_render.go
View file

@ -338,7 +338,7 @@ func (s *Site) renderAliases() error {
if isRelative { if isRelative {
// Make alias relative, where "." will be on the // Make alias relative, where "." will be on the
// same directory level as the current page. // same directory level as the current page.
basePath := path.Join(of.RelPermalink(), "..") basePath := path.Join(p.targetPaths().SubResourceBaseLink, "..")
a = path.Join(basePath, a) a = path.Join(basePath, a)
} else { } else {