summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib/external
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-07-01 16:29:11 +0200
committerVincent Petry <pvince81@owncloud.com>2015-07-01 16:29:11 +0200
commit9c06975bd5c9ef5f5528bfb6a8980c6c11f06035 (patch)
tree203f5e03aa41608e3a37211658cf40e2f9e6b001 /apps/files_sharing/lib/external
parent709eca20854c60a41ac811854174a6e883b8f770 (diff)
downloadnextcloud-server-9c06975bd5c9ef5f5528bfb6a8980c6c11f06035.tar.gz
nextcloud-server-9c06975bd5c9ef5f5528bfb6a8980c6c11f06035.zip
Fix scanFile signature to avoid boring warning
Diffstat (limited to 'apps/files_sharing/lib/external')
-rw-r--r--apps/files_sharing/lib/external/scanner.php4
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) {