diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-09 14:38:45 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-09 14:38:45 +0100 |
| commit | 800738f51a1031839711b53d6859b0ce188a8b4c (patch) | |
| tree | db4dcb743c691e3ed4bfdb06b4909ff7a83e9fd6 /lib | |
| parent | 1f1643b35fef94b64e6997e1af2a3ca87fe0d889 (diff) | |
| parent | 16b0d52031a9c354d09044ad5e473ba87c09e8f3 (diff) | |
| download | nextcloud-server-800738f51a1031839711b53d6859b0ce188a8b4c.tar.gz nextcloud-server-800738f51a1031839711b53d6859b0ce188a8b4c.zip | |
Merge pull request #12011 from owncloud/reuse-etag-default
Default to reusing etags in the scanner
Diffstat (limited to 'lib')
| -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 a5383cee10d..d24b7459851 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); if ($data !== null) { @@ -247,7 +247,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; |