Added CurrentSubsite in at ControllerSubsites decorator

_config.php

@@ -8,8 +8,9 @@
 Object::add_extension('SiteTree', 'SiteTreeSubsites');
 // Hack - this ensures that the SiteTree defineMethods gets called before any of its subclasses...
 new SiteTree();
-
+Object::add_extension('ContentController', 'ControllerSubsites');
 Object::add_extension('LeftAndMain', 'LeftAndMainSubsites');
+Object::add_extension('LeftAndMain', 'ControllerSubsites');
 Object::add_extension('Group', 'GroupSubsites');
 Object::add_extension('File', 'FileSubsites');
 

code/ControllerSubsites.php

@@ -0,0 +1,18 @@
+<?php
+
+class ControllerSubsites extends Extension {
+	function controllerAugmentInit(){
+		if($subsite = Subsite::currentSubsite()){
+			if($theme = $subsite->Theme)
+			SSViewer::set_theme($theme);
+		}
+	}
+	
+	function CurrentSubsite(){
+		if($subsite = Subsite::currentSubsite()){
+			return $subsite;
+		}
+	}
+}
+
+?>

code/Subsite.php

@@ -20,6 +20,9 @@ class Subsite extends DataObject implements PermissionProvider {
 		'IsPublic' => 'Boolean'
 	);
 	
+	static $has_one = array(
+	);
+	
 	static $indexes = array(
 		'Subdomain' => true,
 		'Domain' => true
@@ -94,6 +97,8 @@ class Subsite extends DataObject implements PermissionProvider {
 /*		if($themes = SSViewer::getThemes(false))
 			$fields->addFieldsToTab('Root.Configuration', new DropdownField('Theme', 'Theme:', $themes, $this->Theme));
 */
+
+		$this->updateCMSFields($fields);
 		return $fields;
 	}