diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-16 00:13:10 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-16 00:13:10 +0200 |
| commit | 7279a07ca20949cf3cee82faf064d6aae8cf0a99 (patch) | |
| tree | 01d912d1743db2e34225383d3f8b9783c9b6e295 /lib/files | |
| parent | d91104e120d570eaf3d80c23c5caf6b597b24db7 (diff) | |
| parent | bd1895bdf8dff07bf9dc9803ce991e39daa52acc (diff) | |
| download | nextcloud-server-7279a07ca20949cf3cee82faf064d6aae8cf0a99.tar.gz nextcloud-server-7279a07ca20949cf3cee82faf064d6aae8cf0a99.zip | |
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
Diffstat (limited to 'lib/files')
| -rw-r--r-- | lib/files/cache/scanner.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index adecc2bb901..597eabecf54 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -184,7 +184,7 @@ class Scanner extends BasicEmitter { } \OC_DB::commit(); foreach ($childQueue as $child) { - $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE); + $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse); if ($childSize === -1) { $size = -1; } else { |