always check for unique filename, if a file gets added from outside the mount

point should be adjusted to ne unique again
This commit is contained in:
Bjoern Schiessle 2014-05-22 14:29:23 +02:00
parent 1166d62d9b
commit 11aa2cf74b
1 changed files with 6 additions and 6 deletions

View File

@ -517,14 +517,14 @@ class Shared extends \OC\Files\Storage\Common {
$parent = dirname($parent);
}
$newMountPoint = \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint);
$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
array(),
new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
);
if($newMountPoint !== $share['file_target']) {
$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
$newMountPoint,
array(),
new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
);
self::updateFileTarget($newMountPoint, $share);
$share['file_target'] = $newMountPoint;