hugo

commit f9d6feca0802cd83c4d843244ce389cf7c792cec
parent 439ab0339d9ac6972caabaa55fa41887ace839cb
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sat, 30 Mar 2019 16:46:18 +0100

hugolib: Fix alias path for AMP and similar

Fixes #5760

Diffstat:
M
hugolib/alias_test.go
 | 
2
+-
M
hugolib/site_render.go
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go
@@ -80,7 +80,7 @@ func TestAliasMultipleOutputFormats(t *testing.T) {
 
 	// the alias redirectors
 	b.AssertFileContent("public/foo/bar/index.html", "<meta http-equiv=\"refresh\" content=\"0; ")
-	b.AssertFileContent("public/foo/bar/amp/index.html", "<meta http-equiv=\"refresh\" content=\"0; ")
+	b.AssertFileContent("public/amp/foo/bar/index.html", "<meta http-equiv=\"refresh\" content=\"0; ")
 	assert.False(b.CheckExists("public/foo/bar/index.json"))
 }
 
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
@@ -305,7 +305,7 @@ func (s *Site) renderAliases() error {
 			for _, a := range p.Aliases() {
 				if f.Path != "" {
 					// Make sure AMP and similar doesn't clash with regular aliases.
-					a = path.Join(a, f.Path)
+					a = path.Join(f.Path, a)
 				}
 
 				lang := p.Language().Lang