summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-05-30 14:58:59 +0200
committericewind1991 <robin@icewind.nl>2014-05-30 14:58:59 +0200
commit2ba5701b1af3ba37061fa0e5fa85aac7abaabea4 (patch)
tree880ca8c8cfbf48a103b42571645668eb918898c1 /apps
parent517501ffbf369b24191d8b9a9f2ce44a9891fb97 (diff)
parent998fa2d9be4a876cec00073b0706a793276ddd8f (diff)
downloadnextcloud-server-2ba5701b1af3ba37061fa0e5fa85aac7abaabea4.tar.gz
nextcloud-server-2ba5701b1af3ba37061fa0e5fa85aac7abaabea4.zip
Merge pull request #8778 from owncloud/storage-instanceof
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/proxy.php2
-rw-r--r--apps/files_sharing/lib/sharedstorage.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/proxy.php b/apps/files_sharing/lib/proxy.php
index c899a4b4dd3..f595328cc63 100644
--- a/apps/files_sharing/lib/proxy.php
+++ b/apps/files_sharing/lib/proxy.php
@@ -57,7 +57,7 @@ class Proxy extends \OC_FileProxy {
$mountManager = \OC\Files\Filesystem::getMountManager();
$mountedShares = $mountManager->findIn($path);
foreach ($mountedShares as $mount) {
- if ($mount->getStorage() instanceof \OC\Files\Storage\Shared) {
+ if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Shared')) {
$mountPoint = $mount->getMountPoint();
$mountPointName = $mount->getMountPointName();
$target = \OCA\Files_Sharing\Helper::generateUniqueTarget(dirname($path) . '/' . $mountPointName, array(), $view);
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 67ccbd13403..a7dd2b3afa1 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -300,7 +300,7 @@ class Shared extends \OC\Files\Storage\Common {
// it shouldn't be possible to move a Shared storage into another one
list($targetStorage, ) = \OC\Files\Filesystem::resolvePath($targetPath);
- if ($targetStorage instanceof \OC\Files\Storage\Shared) {
+ if ($targetStorage->instanceOfStorage('\OC\Files\Storage\Shared')) {
\OCP\Util::writeLog('file sharing',
'It is not allowed to move one mount point into another one',
\OCP\Util::DEBUG);