diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index bed7e4df1..f1740b5fc 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -973,8 +973,12 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid * Stub method to get the site config, provided so it's easy to override */ function getSiteConfig() { - if ($this->hasMethod('alternateSiteConfig')) { - return $this->alternateSiteConfig(); + $altConfig = false; + if($this->hasMethod('alternateSiteConfig')) { + $altConfig = $this->alternateSiteConfig(); + } + if($altConfig) { + return $altConfig; } elseif($this->hasExtension('Translatable')) { return SiteConfig::current_site_config($this->Locale); } else {