Add parent as owner to Site

And pull up common member vars like Tmpl and Multilinguage.

Or: the final multilingual TODO-fixes.

See #2309
This commit is contained in:
Bjørn Erik Pedersen
2016-08-08 10:12:39 +02:00
parent 9798a95670
commit d953e39e63
5 changed files with 63 additions and 61 deletions

View File

@@ -72,7 +72,10 @@ func (ml *Multilingual) enabled() bool {
}
func (s *Site) multilingualEnabled() bool {
return s.Multilingual != nil && s.Multilingual.enabled()
if s.owner == nil {
return false
}
return s.owner.multilingual != nil && s.owner.multilingual.enabled()
}
func toSortedLanguages(l map[string]interface{}) (helpers.Languages, error) {