This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/magnolia-site/src/main/java/info/magnolia/module/site/ConfiguredSite.java b/magnolia-site/src/main/java/info/magnolia/module/site/ConfiguredSite.java | |
| index 8d61b9b..f2d54fe 100644 | |
| --- a/magnolia-site/src/main/java/info/magnolia/module/site/ConfiguredSite.java | |
| +++ b/magnolia-site/src/main/java/info/magnolia/module/site/ConfiguredSite.java | |
| @@ -61,7 +61,7 @@ public class ConfiguredSite implements Site { | |
| private ThemeReference theme = new ThemeReference(); | |
| - private I18nContentSupport i18n = new DefaultI18nContentSupport(); | |
| + private I18nContentSupport i18n; | |
| private List<Domain> domains = new ArrayList<Domain>(); | |
| diff --git a/magnolia-site/src/main/java/info/magnolia/module/site/i18n/SiteI18nContentSupport.java b/magnolia-site/src/main/java/info/magnolia/module/site/i18n/SiteI18nContentSupport.java | |
| index 7d92388..e8cf962 100644 | |
| --- a/magnolia-site/src/main/java/info/magnolia/module/site/i18n/SiteI18nContentSupport.java | |
| +++ b/magnolia-site/src/main/java/info/magnolia/module/site/i18n/SiteI18nContentSupport.java | |
| @@ -35,6 +35,7 @@ package info.magnolia.module.site.i18n; | |
| import info.magnolia.cms.core.Content; | |
| import info.magnolia.cms.core.NodeData; | |
| +import info.magnolia.cms.i18n.DefaultI18nContentSupport; | |
| import info.magnolia.cms.i18n.I18nContentSupport; | |
| import info.magnolia.module.site.provider.SiteProvider; | |
| @@ -53,6 +54,8 @@ import com.google.inject.Inject; | |
| */ | |
| public class SiteI18nContentSupport implements I18nContentSupport { | |
| + private static final I18nContentSupport DEFAULT_I18N_CONTENT_SUPPORT = new DefaultI18nContentSupport(); | |
| + | |
| private final SiteProvider siteProvider; | |
| // Needed for proxies. | |
| @@ -66,7 +69,12 @@ public class SiteI18nContentSupport implements I18nContentSupport { | |
| } | |
| protected I18nContentSupport getI18nContentSupport() { | |
| - return siteProvider.get().getI18n(); | |
| + final I18nContentSupport siteI18nContentSupport = siteProvider.get().getI18n(); | |
| + if (siteI18nContentSupport != null) { | |
| + return siteI18nContentSupport; | |
| + } else { | |
| + return DEFAULT_I18N_CONTENT_SUPPORT; | |
| + } | |
| } | |
| @Override |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment