Fixing missing trailing slash in baseUrl

diff --git a/hugolib/site.go b/hugolib/site.go
index 0b052a4f9824281e8644b9f482ba962c8f693a7b..941a965bf1f0db808440bb6ee9dc02aa50890c39 100644 (file)
--- 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)
        }
 }