diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-07-01 21:42:05 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-07-01 21:42:05 +0200 |
| commit | ba9b214aaa0406b0a54032e2c84577af9918521b (patch) | |
| tree | 2e6206b743690c44eba281b6248b4992cabde80c | |
| parent | 2eb9936d77c895073898a1012ad209f7ca825b92 (diff) | |
| parent | 9c06975bd5c9ef5f5528bfb6a8980c6c11f06035 (diff) | |
| download | nextcloud-server-ba9b214aaa0406b0a54032e2c84577af9918521b.tar.gz nextcloud-server-ba9b214aaa0406b0a54032e2c84577af9918521b.zip | |
Merge pull request #17295 from owncloud/scanfilesignature
Fix scanFile signature to avoid boring warning
| -rw-r--r-- | apps/files_sharing/lib/external/scanner.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index dd2c086e84c..06708452c73 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -48,9 +48,11 @@ class Scanner extends \OC\Files\Cache\Scanner { * @param int $reuseExisting * @param int $parentId * @param array | null $cacheData existing data in the cache for the file to be scanned + * @param bool $lock set to false to disable getting an additional read lock during scanning + * @param array | null $cacheData existing data in the cache for the file to be scanned * @return array an array of metadata of the scanned file */ - public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null) { + public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) { try { return parent::scanFile($file, $reuseExisting); } catch (ForbiddenException $e) { |