summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-04-15 12:40:15 +0200
committerRoeland Jago Douma <rullzer@owncloud.com>2016-04-19 14:04:00 +0200
commitc98fef8a51aa9828097db697fde2641771ed24c7 (patch)
treed35ff3ccbddaf951390f2cf2bac2bbb5d46dde73 /apps
parent92abb5f23d3beb7e60c9f3a656a7ca41b5812da7 (diff)
downloadnextcloud-server-c98fef8a51aa9828097db697fde2641771ed24c7.tar.gz
nextcloud-server-c98fef8a51aa9828097db697fde2641771ed24c7.zip
Fix resolve path
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/scanner.php3
-rw-r--r--apps/files_sharing/lib/sharedstorage.php11
2 files changed, 1 insertions, 13 deletions
diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php
index 74394e9ec67..2e951423aa2 100644
--- a/apps/files_sharing/lib/scanner.php
+++ b/apps/files_sharing/lib/scanner.php
@@ -45,8 +45,7 @@ class SharedScanner extends Scanner {
if ($data === null) {
return null;
}
- $sourcePath = '/' . $this->storage->getOwner($path) . '/' . $this->storage->getSourcePath($path);
- list($sourceStorage, $internalPath) = \OC\Files\Filesystem::resolvePath($sourcePath);
+ list($sourceStorage, $internalPath) = $this->storage->resolvePath($path);
$data['permissions'] = $sourceStorage->getPermissions($internalPath);
return $data;
}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index fd99503d84a..4fc8276ece6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -350,17 +350,6 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
}
/**
- * Resolve the path for the source of the share
- *
- * @param string $path
- * @return array
- */
- public function resolvePath($path) {
- $source = '/' . $this->newShare->getShareOwner() . '/' . $this->getSourcePath($path);
- return \OC\Files\Filesystem::resolvePath($source);
- }
-
- /**
* @param string $path
* @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
* @param \OCP\Lock\ILockingProvider $provider