From: spf13 <steve.francia@gmail.com>
Date: Thu, 8 Aug 2013 11:30:01 +0000 (+0100)
Subject: Fixing missing trailing slash in baseUrl
X-Git-Tag: v0.9~177
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a870f4d95571b4ba19048b1ec1310d3ef3f2f9aa;p=brevno-suite%2Fhugo

Fixing missing trailing slash in baseUrl
---

diff --git a/hugolib/site.go b/hugolib/site.go
index 0b052a4f..941a965b 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)
 	}
 }