wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use instanceOfStorage instead of instanceof

Browse source
This commit is contained in:
Robin Appelman 2014-05-29 13:52:58 +02:00
parent 8c5521fdfc
commit 99d46af0b4
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/proxy.php
View file

@ -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);

2
apps/files_sharing/lib/sharedstorage.php
View file

@ -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);

5
lib/private/util.php
View file

@ -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) {