summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-01-08 10:19:16 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-01-08 10:19:16 +0100
commit4c93b00990edb786e96421d4e3d791a831ad091b (patch)
tree8b41a05d605f7034994e88718e0f2f3fa040dceb /lib
parent5eef107344bbb3fc4a93675f6d3b63fc82ba930a (diff)
parenteac9c45fed1c6ae71a4db24d7f5cd8deb9b243b1 (diff)
downloadnextcloud-server-4c93b00990edb786e96421d4e3d791a831ad091b.tar.gz
nextcloud-server-4c93b00990edb786e96421d4e3d791a831ad091b.zip
Merge branch 'master' into disable-mod_pagespeed
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/cache/homecache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 18dfbfe3191..71bb944da71 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -16,7 +16,7 @@ class HomeCache extends Cache {
* @return int
*/
public function calculateFolderSize($path) {
- if ($path !== '/' and $path !== '') {
+ if ($path !== '/' and $path !== '' and $path !== 'files') {
return parent::calculateFolderSize($path);
}