Fix HugoInfo init

See #570
This commit is contained in:
bep
2015-01-19 02:40:34 +01:00
parent ac6b86aff8
commit 73d923e95d
3 changed files with 14 additions and 11 deletions

View File

@@ -67,7 +67,6 @@ type Site struct {
Taxonomies TaxonomyList
Source source.Input
Sections Taxonomy
Hugo HugoInfo
Info SiteInfo
Shortcodes map[string]ShortcodeFunc
Menus Menus
@@ -341,7 +340,6 @@ func (s *Site) initialize() (err error) {
s.Menus = Menus{}
s.Hugo = NewHugoInfo()
s.initializeSiteInfo()
s.Shortcodes = make(map[string]ShortcodeFunc)
@@ -369,7 +367,6 @@ func (s *Site) initializeSiteInfo() {
Menus: &s.Menus,
Params: params,
Permalinks: permalinks,
Hugo: &s.Hugo,
}
}
@@ -731,10 +728,10 @@ func (s *Site) assembleSections() {
for i, wp := range s.Sections[k] {
if i > 0 {
wp.Page.NextInSection = s.Sections[k][i - 1].Page;
wp.Page.NextInSection = s.Sections[k][i-1].Page
}
if i < len(s.Sections[k]) - 1 {
wp.Page.PrevInSection = s.Sections[k][i + 1].Page;
if i < len(s.Sections[k])-1 {
wp.Page.PrevInSection = s.Sections[k][i+1].Page
}
}
}
@@ -1194,7 +1191,6 @@ func (s *Site) NewNode() *Node {
return &Node{
Data: make(map[string]interface{}),
Site: &s.Info,
Hugo: &s.Hugo,
}
}