Merge pull request #68 from SilbinaryWolf/feat-assetdir

feat(Multisites): Upload::uploads_folder config now updates to the current Site asset folder. Tested on backend and frontend UserForms.
symbiote · Dec 14, 2016 · bc52478 · bc52478
2 parents f85066f + cfba28d
commit bc52478
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/code/extensions/MultisitesControllerExtension.php b/code/extensions/MultisitesControllerExtension.php
@@ -17,10 +17,23 @@ public function onAfterInit() {
 		}
 
 		$site = Multisites::inst()->getCurrentSite();
+		if (!$site) {
+			return;
+		}
 
-		if($site && $theme = $site->getSiteTheme()) {
+		$theme = $site->getSiteTheme();
+		if ($theme) {
 			SSViewer::set_theme($theme);
 		}
+
+		// Update default uploads folder to site
+		$assetDir = Config::inst()->get('Upload', 'uploads_folder');
+		$folder = $site->Folder();
+		if ($folder->exists()) {
+			$siteAssetDir = ltrim($folder->getRelativePath(), ASSETS_DIR.'/');
+			$siteAssetDir = rtrim($siteAssetDir, '/');
+			Config::inst()->update('Upload', 'uploads_folder', $siteAssetDir);
+		}
 	}
 
 	/**