summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib/share
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-04-09 17:52:24 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-04-23 12:54:25 +0200
commita86d97295e4e0e1560bcd4cce4bde21aa60a2486 (patch)
treec1a73dd7a985e8e09beeaa10cbf7631ff866b1d6 /apps/files_sharing/lib/share
parent4c840cb61d560ae567e3e9aaa7bd411cac917e48 (diff)
downloadnextcloud-server-a86d97295e4e0e1560bcd4cce4bde21aa60a2486.tar.gz
nextcloud-server-a86d97295e4e0e1560bcd4cce4bde21aa60a2486.zip
fix encryption tests after the removal of the shared folder
Diffstat (limited to 'apps/files_sharing/lib/share')
-rw-r--r--apps/files_sharing/lib/share/file.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index e1d0b49706b..c0c9e0c107e 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -60,6 +60,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
*/
public function generateTarget($filePath, $shareWith, $exclude = null) {
$target = '/'.basename($filePath);
+
+ // for group shares we return the target right away
+ if ($shareWith === false) {
+ return $target;
+ }
+
\OC\Files\Filesystem::initMountPoints($shareWith);
$view = new \OC\Files\View('/' . $shareWith . '/files');
$excludeList = \OCP\Share::getItemsSharedWithUser('file', $shareWith, self::FORMAT_TARGET_NAMES);