tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix to allow ASSETS_DIR to be a subdirectory

Browse Source
This commit is contained in:
Brendan Halley 2017-01-31 09:46:14 +11:00
parent 2f78f43273
commit 10d9f9080b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/CMSFileAddController.php
View File

@ -73,7 +73,7 @@ class CMSFileAddController extends LeftAndMain {
if($folder->exists() && $folder->getFilename()) { if($folder->exists() && $folder->getFilename()) {
// The Upload class expects a folder relative *within* assets/ // 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); $uploadField->setFolderName($path);
} else { } else {
$uploadField->setFolderName('/'); // root of the assets $uploadField->setFolderName('/'); // root of the assets