tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1731 from trewq/asset-upload-directory-fix 

Fix error when uploading file and ASSETS_DIR is a subdirectory
This commit is contained in:
Damian Mooyman 2017-01-31 15:47:16 +13:00 committed by GitHub
parent f26ecb2a9c 10d9f9080b
commit ac6083c9a2
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

@ -68,7 +68,7 @@ class CMSFileAddController extends LeftAndMain {
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