tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX SiteTree::getSiteConfig() should always fall back to using a default if an alternate config wasn't found

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100932 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-03-11 21:50:23 +00:00 committed by Sam Minnee
parent 1ec5c18ab5
commit a93107f4d4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/model/SiteTree.php
View File

@ -955,8 +955,12 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* Stub method to get the site config, provided so it's easy to override * Stub method to get the site config, provided so it's easy to override
*/ */
function getSiteConfig() { function getSiteConfig() {
if ($this->hasMethod('alternateSiteConfig')) { $altConfig = false;
return $this->alternateSiteConfig(); if($this->hasMethod('alternateSiteConfig')) {
$altConfig = $this->alternateSiteConfig();
}
if($altConfig) {
return $altConfig;
} elseif($this->hasExtension('Translatable')) { } elseif($this->hasExtension('Translatable')) {
return SiteConfig::current_site_config($this->Locale); return SiteConfig::current_site_config($this->Locale);
} else { } else {