aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-05-29 13:52:58 +0200
committerRobin Appelman <icewind@owncloud.com>2014-05-29 13:52:58 +0200
commit99d46af0b42dcf4ae221aebc862085615fc70af1 (patch)
tree9c2e39d7351aac80c5f0eb65ed3e7a212f09d13b
parent8c5521fdfc2e9e85037c61cd77a254e3b7cd1b94 (diff)
downloadnextcloud-server-99d46af0b42dcf4ae221aebc862085615fc70af1.tar.gz
nextcloud-server-99d46af0b42dcf4ae221aebc862085615fc70af1.zip
Use instanceOfStorage instead of instanceof
-rw-r--r--apps/files_sharing/lib/proxy.php2
-rw-r--r--apps/files_sharing/lib/sharedstorage.php2
-rwxr-xr-xlib/private/util.php5
3 files changed, 6 insertions, 3 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);
diff --git a/lib/private/util.php b/lib/private/util.php
index 23c7053002c..bf7f39ebb20 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -57,7 +57,10 @@ class OC_Util {
// set up quota for home storages, even for other users
// which can happen when using sharing
- if ($storage instanceof \OC\Files\Storage\Home) {
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ if ($storage->instanceOfStorage('\OC\Files\Storage\Home')) {
$user = $storage->getUser()->getUID();
$quota = OC_Util::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {