aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Paroz <github@oparoz.com>2015-06-26 17:45:04 +0200
committerOlivier Paroz <github@oparoz.com>2015-06-26 17:45:04 +0200
commitb30515dddae4d9d72da9624985e5ae525dfae0c7 (patch)
treefcae00442bcddf5f043f8fc64b2be55997cc35c5
parentac9412639333b6876f7b4b9d0c9f1d2035890c58 (diff)
downloadnextcloud-server-b30515dddae4d9d72da9624985e5ae525dfae0c7.tar.gz
nextcloud-server-b30515dddae4d9d72da9624985e5ae525dfae0c7.zip
Signature of overriding method should match the parent
-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 653d4b7dd47..dd2c086e84c 100644
--- a/apps/files_sharing/lib/external/scanner.php
+++ b/apps/files_sharing/lib/external/scanner.php
@@ -34,7 +34,7 @@ class Scanner extends \OC\Files\Cache\Scanner {
protected $storage;
/** {@inheritDoc} */
- public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
+ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
$this->scanAll();
}