[Pkg-owncloud-commits] [owncloud] 142/205: Signature of overriding method should match the parent

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b30515dddae4d9d72da9624985e5ae525dfae0c7
Author: Olivier Paroz <github at oparoz.com>
Date:   Fri Jun 26 17:45:04 2015 +0200

    Signature of overriding method should match the parent
---
 apps/files_sharing/lib/external/scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php
index 653d4b7..dd2c086 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();
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git