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

Default to reusing etags in the scanner

diff --cc lib/private/files/cache/scanner.php
index a5383cee10ddfb941f44a1ecdfdc785d15ed7333,bd25d8a944c1eac573a9e1dee8370c7343393f22..d24b7459851c3131caa0c41561ed1c0ab1754969
--- 1/lib/private/files/cache/scanner.php
--- 2/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@@ -216,13 -216,11 +216,13 @@@ 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);
 -              $data['size'] = $size;
 +              if ($data !== null) {
 +                      $size = $this->scanChildren($path, $recursive, $reuse);
 +                      $data['size'] = $size;
 +              }
                return $data;
        }