Fix to allow ASSETS_DIR to be a subdirectory

silverstripe · Jan 30, 2017 · 10d9f90 · 10d9f90
1 parent 2f78f43
commit 10d9f90
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
@@ -73,7 +73,7 @@ public function getEditForm($id = null, $fields = null) {
 
 		if($folder->exists() && $folder->getFilename()) {
 			// The Upload class expects a folder relative *within* assets/
-			$path = preg_replace('/^' . ASSETS_DIR . '\//', '', $folder->getFilename());
+			$path = preg_replace('/^' . preg_quote(ASSETS_DIR, '/') . '\//', '', $folder->getFilename());
 			$uploadField->setFolderName($path);
 		} else {
 			$uploadField->setFolderName('/'); // root of the assets