From 47227a93956d5d3077e3f35dac62bb500f12b119 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 27 Sep 2010 02:30:39 +0000 Subject: [PATCH] BUGFIX ContentController::SiteConfig() should look to the SiteTree record so an alternate SiteConfig is considered, if this method doesn't exist on the data record then fall back to the default SiteConfig git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111255 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/control/ContentController.php b/core/control/ContentController.php index 382d25d63..a8979fa92 100755 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -401,7 +401,11 @@ HTML; } function SiteConfig() { - return SiteConfig::current_site_config(); + if(method_exists($this->dataRecord, 'getSiteConfig')) { + return $this->dataRecord->getSiteConfig(); + } else { + return SiteConfig::current_site_config(); + } } /**