diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-11-06 18:34:10 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-11-06 18:34:10 +0100 |
| commit | 16b0d52031a9c354d09044ad5e473ba87c09e8f3 (patch) | |
| tree | 707ed0b91c9f54e17f2bf80d0cbaf09d9356460f /lib/private | |
| parent | f73d65303601574e1bcc68e0aa8ae8ef4853a118 (diff) | |
| download | nextcloud-server-16b0d52031a9c354d09044ad5e473ba87c09e8f3.tar.gz nextcloud-server-16b0d52031a9c354d09044ad5e473ba87c09e8f3.zip | |
Default to reusing etags in the scanner
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 444207518b2..bd25d8a944c 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -216,7 +216,7 @@ class Scanner extends BasicEmitter { */ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { if ($reuse === -1) { - $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0; + $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } $data = $this->scanFile($path, $reuse); $size = $this->scanChildren($path, $recursive, $reuse); @@ -245,7 +245,7 @@ class Scanner extends BasicEmitter { */ public function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { if ($reuse === -1) { - $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0; + $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } $this->emit('\OC\Files\Cache\Scanner', 'scanFolder', array($path, $this->storageId)); $size = 0; |