Merge pull request #17295 from owncloud/scanfilesignature

Fix scanFile signature to avoid boring warning
remotes/origin/handlebars-approach
Lukas Reschke 11 years ago
commit ba9b214aaa
  1. 4
      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) {

Loading…
Cancel
Save