diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-10 16:17:29 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-10 16:17:29 +0100 |
| commit | 80ae311329f56295e9ec6a4d3cee66cb9afc1a4f (patch) | |
| tree | 24ca0805d06f7af4da69ecf635d77c6f40041ee1 /lib/private/files/cache | |
| parent | 3898fbc0d2d65785b8b132645c5bf99077d16818 (diff) | |
| parent | 0f17486c1d6d974e25ea75597bd2ca6f50e5e538 (diff) | |
| download | nextcloud-server-80ae311329f56295e9ec6a4d3cee66cb9afc1a4f.tar.gz nextcloud-server-80ae311329f56295e9ec6a4d3cee66cb9afc1a4f.zip | |
Merge pull request #11892 from owncloud/remove_triggerupdate
Remove triggerupdate.php & add quiet option for CLI scanner
Diffstat (limited to 'lib/private/files/cache')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 444207518b2..a5383cee10d 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -219,8 +219,10 @@ class Scanner extends BasicEmitter { $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0; } $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; } |