Merge branch 'saas-s3proxy' into saas

This commit is contained in:
Albert Santoni 2015-04-01 13:49:47 -04:00
commit 7fd58ac51b
12 changed files with 116 additions and 36 deletions

View file

@ -1073,7 +1073,9 @@ class ApiController extends Zend_Controller_Action
$dir->getId(),$all=false);
foreach ($files as $f) {
// if the file is from this mount
if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {
$filePaths = $f->getFilePaths();
$filePath = $filePaths[0];
if (substr($filePath, 0, strlen($rd)) === $rd) {
$f->delete();
}
}