shithub: hugo

Download patch

ref: 8969331f5be352939883074034adac6b7086ddc8
parent: 6feb138785eeb9e813428d0df30010d9b5fb1059
author: Bjørn Erik Pedersen <[email protected]>
date: Sat Jan 6 13:42:32 EST 2018 

Fix multihost detection for sites without language definition

Static content was wrongly put into the lang-code subfolder.

Fixes #4221


--- a/helpers/language.go
+++ b/helpers/language.go
@@ -100,9 +100,13 @@
 	return l.params
 }
 
-// IsMultihost returns whether the languages has baseURL specificed on the
-// language level.
+// IsMultihost returns whether there are more than one language and at least one of
+// the languages has baseURL specificed on the language level.
 func (l Languages) IsMultihost() bool {
+	if len(l) <= 1 {
+		return false
+	}
+
 	for _, lang := range l {
 		if lang.GetLocal("baseURL") != nil {
 			return true
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -134,25 +134,24 @@
 	cfg.Set("languagesSorted", langs)
 	cfg.Set("multilingual", len(langs) > 1)
 
-	// The baseURL may be provided at the language level. If that is true,
-	// then every language must have a baseURL. In this case we always render
-	// to a language sub folder, which is then stripped from all the Permalink URLs etc.
-	var baseURLFromLang bool
+	multihost := langs.IsMultihost()
 
-	for _, l := range langs {
-		burl := l.GetLocal("baseURL")
-		if baseURLFromLang && burl == nil {
-			return errors.New("baseURL must be set on all or none of the languages")
-		}
+	if multihost {
+		cfg.Set("defaultContentLanguageInSubdir", true)
+		cfg.Set("multihost", true)
+	}
 
-		if burl != nil {
-			baseURLFromLang = true
+	if multihost {
+		// The baseURL may be provided at the language level. If that is true,
+		// then every language must have a baseURL. In this case we always render
+		// to a language sub folder, which is then stripped from all the Permalink URLs etc.
+		for _, l := range langs {
+			burl := l.GetLocal("baseURL")
+			if burl == nil {
+				return errors.New("baseURL must be set on all or none of the languages")
+			}
 		}
-	}
 
-	if baseURLFromLang {
-		cfg.Set("defaultContentLanguageInSubdir", true)
-		cfg.Set("multihost", true)
 	}
 
 	return nil