diff options
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Filesystem.php | 19 | ||||
| -rw-r--r-- | lib/private/Files/View.php | 6 |
2 files changed, 4 insertions, 21 deletions
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 9542666b03c..b9b9534b15f 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -489,25 +489,6 @@ class Filesystem { } /** - * checks if a file is blacklisted for storage in the filesystem - * Listens to write and rename hooks - * - * @param array $data from hook - */ - public static function isBlacklisted($data) { - if (isset($data['path'])) { - $path = $data['path']; - } elseif (isset($data['newpath'])) { - $path = $data['newpath']; - } - if (isset($path)) { - if (self::isFileBlacklisted($path)) { - $data['run'] = false; - } - } - } - - /** * @param string $filename * @return bool */ diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index c78517d09ef..986aecf556f 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -50,6 +50,8 @@ use Icewind\Streams\CallbackWrapper; use OC\Files\Mount\MoveableMount; use OC\Files\Storage\Storage; use OC\User\LazyUser; +use OC\Share\Share; +use OC\User\User; use OCA\Files_Sharing\SharedMount; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; @@ -1810,10 +1812,10 @@ class View { } // check if any of the parents were shared by the current owner (include collections) - $shares = \OCP\Share::getItemShared( + $shares = Share::getItemShared( 'folder', $fileId, - \OCP\Share::FORMAT_NONE, + \OC\Share\Constants::FORMAT_NONE, null, true ); |