upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache

Browse source 
fix for infinite loop causing on files_encryption branch when testing
This commit is contained in:
FlorinPeter 2013-04-29 17:05:41 -07:00
commit b464970142
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/files/cache/cache.php vendored
View file

@ -430,7 +430,7 @@ class Cache {
$this->calculateFolderSize($path);
if ($path !== '') {
$parent = dirname($path);
if ($parent === '.') {
if ($parent === '.' or $parent === '/') {
$parent = '';
}
$this->correctFolderSize($parent);

2
lib/files/cache/scanner.php vendored
View file

@ -68,7 +68,7 @@ class Scanner {
if ($data) {
if ($file) {
$parent = dirname($file);
if ($parent === '.') {
if ($parent === '.' or $parent === '/') {
$parent = '';
}
if (!$this->cache->inCache($parent)) {