tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72 from robert-h-curry/3.1-compatibility

Browse Source 
Extension and config fixes for 3.1
This commit is contained in:
Sean Harvey 2013-04-03 19:14:27 -07:00
commit 355bb8ca8f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
_config.php
View File

@ -5,15 +5,14 @@
* about a number of sub-sites, rather than a single site. * about a number of sub-sites, rather than a single site.
*/ */
Object::add_extension('SiteTree', 'SiteTreeSubsites'); SiteTree::add_extension('SiteTreeSubsites');
Object::add_extension('ContentController', 'ControllerSubsites'); ContentController::add_extension('ControllerSubsites');
Object::add_extension('LeftAndMain', 'LeftAndMainSubsites'); LeftAndMain::add_extension('LeftAndMainSubsites');
Object::add_extension('LeftAndMain', 'ControllerSubsites'); LeftAndMain::add_extension('ControllerSubsites');
Object::add_extension('Group', 'GroupSubsites');
Object::add_extension('File', 'FileSubsites');
Object::add_extension('ErrorPage', 'ErrorPageSubsite');
Object::add_extension('SiteConfig', 'SiteConfigSubsites');
Group::add_extension('GroupSubsites');
File::add_extension('FileSubsites');
ErrorPage::add_extension('ErrorPageSubsite');
SiteConfig::add_extension('SiteConfigSubsites');
SS_Report::add_excluded_reports('SubsiteReportWrapper'); SS_Report::add_excluded_reports('SubsiteReportWrapper');

2
code/extensions/ErrorPageSubsite.php
View File

@ -10,7 +10,7 @@ class ErrorPageSubsite extends DataExtension {
* opening ErrorPage in the CMS and publish ErrorPage causes static error page to get generated incorrectly. * opening ErrorPage in the CMS and publish ErrorPage causes static error page to get generated incorrectly.
*/ */
function alternateFilepathForErrorcode($statusCode, $locale = null) { function alternateFilepathForErrorcode($statusCode, $locale = null) {
$static_filepath = Object::get_static($this->owner->ClassName, 'static_filepath'); $static_filepath = Config::inst()->get($this->owner->ClassName, 'static_filepath');
$subdomainPart = ""; $subdomainPart = "";
// Try to get current subsite from session // Try to get current subsite from session