Merge pull request #12011 from owncloud/reuse-etag-default

Default to reusing etags in the scanner
owncloud · Jan 9, 2015 · 800738f · 800738f
2 parents 1f1643b + 16b0d52
commit 800738f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
@@ -216,7 +216,7 @@ protected function updateCache($path, $data) {
 	 */
 	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 @@ protected function getExistingChildren($path) {
 	 */
 	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;