From a870f4d95571b4ba19048b1ec1310d3ef3f2f9aa Mon Sep 17 00:00:00 2001 From: spf13 Date: Thu, 8 Aug 2013 12:30:01 +0100 Subject: [PATCH] Fixing missing trailing slash in baseUrl --- hugolib/site.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hugolib/site.go b/hugolib/site.go index 0b052a4f9..941a965bf 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -198,14 +198,15 @@ func (s *Site) ProcessShortcodes() { } func (s *Site) AbsUrlify() { + baseWithoutTrailingSlash := strings.TrimRight(s.c.BaseUrl, "/") + baseWithSlash := baseWithoutTrailingSlash + "/" for i, _ := range s.Pages { content := string(s.Pages[i].Content) - content = strings.Replace(content, " src=\"/", " src=\""+s.c.BaseUrl, -1) - content = strings.Replace(content, " src='/", " src='"+s.c.BaseUrl, -1) - content = strings.Replace(content, " href='/", " href='"+s.c.BaseUrl, -1) - content = strings.Replace(content, " href=\"/", " href=\""+s.c.BaseUrl, -1) - baseWithoutTrailingSlash := strings.TrimRight(s.c.BaseUrl, "/") - content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithoutTrailingSlash+"/", -1) + content = strings.Replace(content, " src=\"/", " src=\""+baseWithSlash, -1) + content = strings.Replace(content, " src='/", " src='"+baseWithSlash, -1) + content = strings.Replace(content, " href='/", " href='"+baseWithSlash, -1) + content = strings.Replace(content, " href=\"/", " href=\""+baseWithSlash, -1) + content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithSlash, -1) s.Pages[i].Content = template.HTML(content) } }