diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-29 17:14:48 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-14 12:10:37 +0400 |
| commit | 65f3b2fad235417d3f653c9e11aa8d72e8944d28 (patch) | |
| tree | fa863ea6c687bd42343e001be6dc975325a91c75 /lib/private/connector | |
| parent | 4a26219ecf3abe9c1b18d434b8e70a6f9878199c (diff) | |
Add server<->server sharing backend
Diffstat (limited to 'lib/private/connector')
| -rw-r--r-- | lib/private/connector/sabre/directory.php | 3 | ||||
| -rw-r--r-- | lib/private/connector/sabre/objecttree.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php index aa467cec535..9904c3525c4 100644 --- a/lib/private/connector/sabre/directory.php +++ b/lib/private/connector/sabre/directory.php @@ -202,7 +202,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node * @return array */ public function getQuotaInfo() { - $storageInfo = OC_Helper::getStorageInfo($this->path); + $path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath()); + $storageInfo = OC_Helper::getStorageInfo($path); return array( $storageInfo['used'], $storageInfo['free'] diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index c55a392bca0..2cadb5af520 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -117,7 +117,7 @@ class ObjectTree extends \Sabre\DAV\ObjectTree { $isShareMountPoint = false; list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath( '/' . \OCP\User::getUser() . '/files/' . $sourcePath); - if ($storage instanceof \OC\Files\Storage\Shared && !$internalPath) { + if ($storage instanceof \OCA\Files_Sharing\ISharedStorage && !$internalPath) { $isShareMountPoint = true; } |