From: spf13 <steve.francia@gmail.com>
Date: Sat, 10 Aug 2013 01:07:35 +0000 (+0100)
Subject: Merge branch 'master' of github.com:spf13/hugo
X-Git-Tag: v0.9~176
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=733c0207cb855d2d4a5130bc469c662e50b61d59;p=brevno-suite%2Fhugo

Merge branch 'master' of github.com:spf13/hugo

Conflicts:
	hugolib/site.go
---

733c0207cb855d2d4a5130bc469c662e50b61d59
diff --cc hugolib/site.go
index 941a965b,69918062..076e2a06
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@@ -30,8 -30,10 +30,10 @@@ import 
  
  const slash = string(os.PathSeparator)
  
+ var DefaultTimer = nitro.Initalize()
+ 
  type Site struct {
- 	c           Config
 -	Config           Config
++	Config      Config
  	Pages       Pages
  	Tmpl        *template.Template
  	Indexes     IndexList
@@@ -198,15 -224,14 +224,15 @@@ func (s *Site) ProcessShortcodes() 
  }
  
  func (s *Site) AbsUrlify() {
- 	baseWithoutTrailingSlash := strings.TrimRight(s.c.BaseUrl, "/")
++	baseWithoutTrailingSlash := strings.TrimRight(s.Config.BaseUrl, "/")
 +	baseWithSlash := baseWithoutTrailingSlash + "/"
  	for i, _ := range s.Pages {
  		content := string(s.Pages[i].Content)
 -		content = strings.Replace(content, " src=\"/", " src=\""+s.Config.BaseUrl+"/", -1)
 -		content = strings.Replace(content, " src='/", " src='"+s.Config.BaseUrl+"/", -1)
 -		content = strings.Replace(content, " href='/", " href='"+s.Config.BaseUrl+"/", -1)
 -		content = strings.Replace(content, " href=\"/", " href=\""+s.Config.BaseUrl+"/", -1)
 -		baseWithoutTrailingSlash := strings.TrimRight(s.Config.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)
  	}
  }