Writing relative links to absolute so they work in feeds

2 files changed, 16 insertions, 1 deletions

diff --git a/hugolib/site.go b/hugolib/site.go
index 2d4fd0649..ef2ae00d3 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -83,6 +83,8 @@ func (site *Site) Render() {
 	site.timer.Step("render and write lists")
 	site.ProcessShortcodes()
 	site.timer.Step("render shortcodes")
+	site.AbsUrlify()
+	site.timer.Step("absolute URLify")
 	site.RenderPages()
 	site.timer.Step("render pages")
 	site.RenderHomePage()
@@ -182,6 +184,17 @@ func (s *Site) ProcessShortcodes() {
 	}
 }
 
+func (s *Site) AbsUrlify() {
+	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)
+		s.Pages[i].Content = template.HTML(content)
+	}
+}
+
 func (s *Site) CreatePages() {
 	for _, fileName := range s.Files {
 		page := NewPage(fileName)
diff --git a/main.go b/main.go
index 857b88745..9bb5ccd80 100644
--- a/main.go
+++ b/main.go
@@ -64,7 +64,9 @@ func main() {
 
 	if *baseUrl != "" {
 		config.BaseUrl = *baseUrl
-	}
+	} else if *server {
+        config.BaseUrl = "http://localhost:" + *port
+    }
 
 	if *version {
 		fmt.Println("Hugo Static Site Generator v0.8")