github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 09:21:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Avoid repeated Viper loads of sectionPagesMenu

Browse source 
See #2728
This commit is contained in:
Bjørn Erik Pedersen 2016-11-23 22:06:15 +01:00
parent dbb0c1cfc9
commit 1f6e0de361
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/page.go
View file

@ -1092,7 +1092,7 @@ func (p *Page) getParam(key string, stringToLower bool) interface{} {
func (p *Page) HasMenuCurrent(menuID string, me *MenuEntry) bool { func (p *Page) HasMenuCurrent(menuID string, me *MenuEntry) bool {
sectionPagesMenu := helpers.Config().GetString("SectionPagesMenu") sectionPagesMenu := p.Site.sectionPagesMenu
// page is labeled as "shadow-member" of the menu with the same identifier as the section // page is labeled as "shadow-member" of the menu with the same identifier as the section
if sectionPagesMenu != "" && p.Section() != "" && sectionPagesMenu == menuID && p.Section() == me.Identifier { if sectionPagesMenu != "" && p.Section() != "" && sectionPagesMenu == menuID && p.Section() == me.Identifier {

4
hugolib/site.go
View file

@ -191,6 +191,7 @@ type SiteInfo struct {
LanguagePrefix string LanguagePrefix string
Languages helpers.Languages Languages helpers.Languages
defaultContentLanguageInSubdir bool defaultContentLanguageInSubdir bool
sectionPagesMenu string
pathSpec *helpers.PathSpec pathSpec *helpers.PathSpec
} }
@ -937,6 +938,7 @@ func (s *Site) initializeSiteInfo() {
LanguagePrefix: languagePrefix, LanguagePrefix: languagePrefix,
Languages: languages, Languages: languages,
defaultContentLanguageInSubdir: defaultContentInSubDir, defaultContentLanguageInSubdir: defaultContentInSubDir,
sectionPagesMenu: lang.GetString("sectionPagesMenu"),
GoogleAnalytics: lang.GetString("googleAnalytics"), GoogleAnalytics: lang.GetString("googleAnalytics"),
BuildDrafts: viper.GetBool("buildDrafts"), BuildDrafts: viper.GetBool("buildDrafts"),
canonifyURLs: viper.GetBool("canonifyURLs"), canonifyURLs: viper.GetBool("canonifyURLs"),
@ -1412,7 +1414,7 @@ func (s *Site) assembleMenus() {
} }
} }
sectionPagesMenu := s.Language.GetString("sectionPagesMenu") sectionPagesMenu := s.Info.sectionPagesMenu
sectionPagesMenus := make(map[string]interface{}) sectionPagesMenus := make(map[string]interface{})
//creating flat hash //creating flat hash
pages := s.Pages pages := s.Pages