diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-27 02:35:40 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-27 02:35:40 +0200 |
| commit | 77ae2d6fc4527726c3f01206678f7c33768a0420 (patch) | |
| tree | 984016f25150c09d8443db0e0965182d5a859372 | |
| parent | 569c2a8deba92ec3db606f9e4597ac7e3b1803ea (diff) | |
| parent | b30515dddae4d9d72da9624985e5ae525dfae0c7 (diff) | |
| download | nextcloud-server-77ae2d6fc4527726c3f01206678f7c33768a0420.tar.gz nextcloud-server-77ae2d6fc4527726c3f01206678f7c33768a0420.zip | |
Merge pull request #17202 from oparoz/repair-scan-signature
Signature of overriding method should match the parent
| -rw-r--r-- | apps/files_sharing/lib/external/scanner.php | 2 |
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(); } |