Merge pull request #190 from assertchris/3.2-compat

3.2 compat changes
This commit is contained in:
Damian Mooyman 2015-06-09 11:12:45 +12:00
commit 601e174b34
2 changed files with 5 additions and 1 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.DS_Store
host-map.php

View File

@ -205,7 +205,10 @@ class SiteTreeSubsites extends DataExtension {
*/
static function contentcontrollerInit($controller) {
$subsite = Subsite::currentSubsite();
if($subsite && $subsite->Theme) SSViewer::set_theme(Subsite::currentSubsite()->Theme);
if($subsite && $subsite->Theme){
Config::inst()->update('SSViewer', 'theme', Subsite::currentSubsite()->Theme);
}
}
function alternateAbsoluteLink() {