From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 30 Mar 2019 15:46:18 +0000 (+0100)
Subject: hugolib: Fix alias path for AMP and similar
X-Git-Tag: v0.55.0~28
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9d6feca0;p=brevno-suite%2Fhugo

hugolib: Fix alias path for AMP and similar

Fixes #5760
---

diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go
index 684e35c9..f968caf2 100644
--- 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
index a6cf4baf..c528e61a 100644
--- 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