summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-03-17 09:51:45 +0100
committerVincent Petry <pvince81@owncloud.com>2015-03-17 09:51:45 +0100
commit65259114391eaeab1f6ceb44e52e2c0a5efa9027 (patch)
tree92c791b3427164a3dd2672dd947777d6746be1b8 /apps
parentb51b4f0a2cb3a2174b071c92f9e076e6b30fc216 (diff)
parentb9d94051354c394344d0c9ed7a83841fdd29ea2e (diff)
downloadnextcloud-server-65259114391eaeab1f6ceb44e52e2c0a5efa9027.tar.gz
nextcloud-server-65259114391eaeab1f6ceb44e52e2c0a5efa9027.zip
Merge pull request #14929 from owncloud/s2s-scanner-warnings
Fix scanFile signature warnings
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/external/scanner.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php
index b45a8942e96..6744b17e967 100644
--- a/apps/files_sharing/lib/external/scanner.php
+++ b/apps/files_sharing/lib/external/scanner.php
@@ -33,7 +33,7 @@ class Scanner extends \OC\Files\Cache\Scanner {
* @param int $reuseExisting
* @return array an array of metadata of the scanned file
*/
- public function scanFile($file, $reuseExisting = 0) {
+ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null) {
try {
return parent::scanFile($file, $reuseExisting);
} catch (ForbiddenException $e) {